Revert "Tool contact and get version"

This reverts commit 7fdfc04.

Author: URJala

Diff for: ur_robot_driver/include/ur_robot_driver/hardware_interface.h

@@ -54,7 +54,6 @@
 #include <ur_msgs/SetIO.h>
 #include <ur_msgs/SetSpeedSliderFraction.h>
 #include <ur_msgs/SetPayload.h>
-#include <ur_msgs/GetVersion.h>
 
 #include <cartesian_interface/cartesian_command_interface.h>
 #include <cartesian_interface/cartesian_state_handle.h>
@@ -216,9 +215,6 @@ class HardwareInterface : public hardware_interface::RobotHW
   void commandCallback(const std_msgs::StringConstPtr& msg);
   bool setPayload(ur_msgs::SetPayloadRequest& req, ur_msgs::SetPayloadResponse& res);
   bool activateSplineInterpolation(std_srvs::SetBoolRequest& req, std_srvs::SetBoolResponse& res);
-  bool startToolContact(std_srvs::TriggerRequest& req, std_srvs::TriggerResponse& res);
-  bool endToolContact(std_srvs::TriggerRequest& req, std_srvs::TriggerResponse& res);
-  bool getVersion(ur_msgs::GetVersionRequest& req, ur_msgs::GetVersionResponse& res);
 
   std::unique_ptr<urcl::UrDriver> ur_driver_;
   std::unique_ptr<DashboardClientROS> dashboard_client_;
@@ -243,9 +239,6 @@ class HardwareInterface : public hardware_interface::RobotHW
   ros::ServiceServer tare_sensor_srv_;
   ros::ServiceServer set_payload_srv_;
   ros::ServiceServer activate_spline_interpolation_srv_;
-  ros::ServiceServer start_tool_contact_srv_;
-  ros::ServiceServer end_tool_contact_srv_;
-  ros::ServiceServer get_version_srv;
 
   hardware_interface::JointStateInterface js_interface_;
   scaled_controllers::ScaledPositionJointInterface spj_interface_;

Diff for: ur_robot_driver/src/hardware_interface.cpp

@@ -460,16 +460,6 @@ bool HardwareInterface::init(ros::NodeHandle& root_nh, ros::NodeHandle& robot_hw
   activate_spline_interpolation_srv_ = robot_hw_nh.advertiseService(
       "activate_spline_interpolation", &HardwareInterface::activateSplineInterpolation, this);
 
-  // Calling this service will enable the tool contact functionality on the robot.
-  start_tool_contact_srv_ =
-      robot_hw_nh.advertiseService("start_tool_contact", &HardwareInterface::startToolContact, this);
-
-  // Calling this service will disable the tool contact functionality on the robot.
-  end_tool_contact_srv_ = robot_hw_nh.advertiseService("end_tool_contact", &HardwareInterface::endToolContact, this);
-
-  // Calling this service will return the software version of the robot.
-  get_version_srv = robot_hw_nh.advertiseService("get_version", &HardwareInterface::getVersion, this);
-
   ur_driver_->startRTDECommunication();
   ROS_INFO_STREAM_NAMED("hardware_interface", "Loaded ur_robot_driver hardware_interface");
 
@@ -1185,28 +1175,6 @@ bool HardwareInterface::setPayload(ur_msgs::SetPayloadRequest& req, ur_msgs::Set
   return true;
 }
 
-bool HardwareInterface::startToolContact(std_srvs::TriggerRequest& req, std_srvs::TriggerResponse& res)
-{
-  res.success = this->ur_driver_->startToolContact();
-  return true;
-}
-
-bool HardwareInterface::endToolContact(std_srvs::TriggerRequest& req, std_srvs::TriggerResponse& res)
-{
-  res.success = this->ur_driver_->endToolContact();
-  return true;
-}
-
-bool HardwareInterface::getVersion(ur_msgs::GetVersionRequest& req, ur_msgs::GetVersionResponse& res)
-{
-  urcl::VersionInformation version_info = this->ur_driver_->getVersion();
-  res.major = version_info.major;
-  res.minor = version_info.minor;
-  res.bugfix = version_info.bugfix;
-  res.build = version_info.build;
-  return true;
-}
-
 void HardwareInterface::commandCallback(const std_msgs::StringConstPtr& msg)
 {
   std::string str = msg->data;

Diff for: ur_robot_driver/test/integration_test.py

@@ -12,10 +12,10 @@
     FollowJointTrajectoryResult,
     JointTolerance)
 from ur_dashboard_msgs.msg import SetModeAction, SetModeGoal, RobotMode
-from std_srvs.srv import Trigger
+from std_srvs.srv import Trigger, TriggerRequest
 import tf
 from trajectory_msgs.msg import JointTrajectoryPoint
-from ur_msgs.srv import SetIO, SetIORequest, GetVersion
+from ur_msgs.srv import SetIO, SetIORequest
 from ur_msgs.msg import IOStates
 
 from cartesian_control_msgs.msg import (
@@ -120,30 +120,6 @@ def init_robot(self):
                 "actually running in headless mode."
                 " Msg: {}".format(err))
 
-        self.get_version = rospy.ServiceProxy("ur_hardware_interface/get_version", GetVersion)
-        try:
-            self.get_version.wait_for_service(timeout)
-        except rospy.exceptions.ROSException as err:
-            self.fail(
-                "Could not reach 'get version' service. Make sure that the driver is actually running."
-                " Msg: {}".format(err))
-
-        self.start_tool_contact = rospy.ServiceProxy('ur_hardware_interface/start_tool_contact', Trigger)
-        try:
-            self.start_tool_contact.wait_for_service(timeout)
-        except rospy.exceptions.ROSException as err:
-            self.fail(
-                "Could not reach 'start tool contact' service. Make sure that the driver is actually running."
-                " Msg: {}".format(err))
-
-        self.end_tool_contact = rospy.ServiceProxy('ur_hardware_interface/end_tool_contact', Trigger)
-        try:
-            self.end_tool_contact.wait_for_service(timeout)
-        except rospy.exceptions.ROSException as err:
-            self.fail(
-                "Could not reach 'end tool contact' service. Make sure that the driver is actually running."
-                " Msg: {}".format(err))
-
         self.script_publisher = rospy.Publisher("/ur_hardware_interface/script_command", std_msgs.msg.String, queue_size=1)
         self.tf_listener = tf.TransformListener()
         self.twist_pub = rospy.Publisher("/twist_controller/command", geometry_msgs.msg.Twist, queue_size=1)
@@ -286,21 +262,6 @@ def test_set_io(self):
             messages += 1
         self.assertEqual(pin_state, 1)
 
-    def test_tool_contact(self):
-        version_info = self.get_version.call()
-        if version_info.major >= 5:
-            start_response = self.start_tool_contact.call()
-            self.assertEqual(start_response.success,True)
-
-            end_response = self.end_tool_contact.call()
-            self.assertEqual(end_response.success, True)
-        else:
-            start_response = self.start_tool_contact.call()
-            self.assertEqual(start_response.success,False)
-
-            end_response = self.end_tool_contact.call()
-            self.assertEqual(end_response.success, False)
-
     def test_cartesian_passthrough(self):
         #### Power cycle the robot in order to make sure it is running correctly####
         self.assertTrue(self.set_robot_to_mode(RobotMode.POWER_OFF))