WIP: Use a config struct

Author: urfeex

include/ur_client_library/ur/ur_driver.h

@@ -44,6 +44,34 @@
 
 namespace urcl
 {
+struct UrDriverConfiguration
+{
+  std::string robot_ip;
+  std::string script_file;
+  std::string output_recipe_file;
+  std::string input_recipe_file;
+  std::function<void(bool)> handle_program_state;
+  bool headless_mode;
+
+  std::unique_ptr<ToolCommSetup> tool_comm_setup = nullptr;
+
+  uint32_t reverse_port = 50001;
+  uint32_t script_sender_port = 50002;
+  uint32_t trajectory_port = 50003;
+  uint32_t script_command_port = 50004;
+  std::string reverse_ip = "";
+
+  int servoj_gain = 2000;
+  double servoj_lookahead_time = 0.03;
+
+  bool non_blocking_read = false;
+
+  // TODO: Remove on 2027-05
+  std::string calibration_checksum = "";
+  double force_mode_damping = 0.025;
+  double force_mode_gain_scaling = 0.5;
+};
+
 /*!
  * \brief This is the main class for interfacing the driver.
  *
@@ -54,6 +82,11 @@ namespace urcl
 class UrDriver
 {
 public:
+  explicit UrDriver(const UrDriverConfiguration& config)
+  {
+    init(config);
+  }
+
   /*!
    * \brief Constructs a new UrDriver object.
    * Upon initialization this class will check the calibration checksum reported from the robot and
@@ -94,12 +127,34 @@ class UrDriver
    * \param script_command_port Port used for forwarding script commands to the robot. The script commands will be
    * executed locally on the robot.
    */
+  // Called sigA in tests
+  [[deprecated("Initializing a UrDriver object with an argument list is deprecated. Please use UrDriver(const "
+               "UrDriverConfiguration& config) instead. This function will be removed in May 2027.")]]
   UrDriver(const std::string& robot_ip, const std::string& script_file, const std::string& output_recipe_file,
            const std::string& input_recipe_file, std::function<void(bool)> handle_program_state, bool headless_mode,
            std::unique_ptr<ToolCommSetup> tool_comm_setup, const uint32_t reverse_port = 50001,
            const uint32_t script_sender_port = 50002, int servoj_gain = 2000, double servoj_lookahead_time = 0.03,
            bool non_blocking_read = false, const std::string& reverse_ip = "", const uint32_t trajectory_port = 50003,
-           const uint32_t script_command_port = 50004);
+           const uint32_t script_command_port = 50004)
+  {
+    UrDriverConfiguration config;
+    config.robot_ip = robot_ip;
+    config.script_file = script_file;
+    config.output_recipe_file = output_recipe_file;
+    config.input_recipe_file = input_recipe_file;
+    config.handle_program_state = handle_program_state;
+    config.headless_mode = headless_mode;
+    config.tool_comm_setup = std::move(tool_comm_setup);
+    config.reverse_port = reverse_port;
+    config.script_sender_port = script_sender_port;
+    config.servoj_gain = servoj_gain;
+    config.servoj_lookahead_time = servoj_lookahead_time;
+    config.non_blocking_read = non_blocking_read;
+    config.reverse_ip = reverse_ip;
+    config.trajectory_port = trajectory_port;
+    config.script_command_port = script_command_port;
+    init(config);
+  }
 
   /*!
    * \brief Constructs a new UrDriver object.
@@ -129,25 +184,38 @@ class UrDriver
    * \param force_mode_damping The damping parameter used when the robot is in force mode, range [0,1]
    * \param force_mode_gain_scaling Scales the gain used when the robot is in force mode, range [0,2] (only e-series)
    */
-  [[deprecated(
-      "Specifying the force mode damping factor and the force mode gain scaling factor at driver creation has "
-      "been deprecated. Force mode parameters should be specified with each activiation of force mode, and "
-      "can be set in the function call to start force mode.")]] UrDriver(const std::string& robot_ip,
-                                                                         const std::string& script_file,
-                                                                         const std::string& output_recipe_file,
-                                                                         const std::string& input_recipe_file,
-                                                                         std::function<void(bool)> handle_program_state,
-                                                                         bool headless_mode,
-                                                                         std::unique_ptr<ToolCommSetup> tool_comm_setup,
-                                                                         const uint32_t reverse_port,
-                                                                         const uint32_t script_sender_port,
-                                                                         int servoj_gain, double servoj_lookahead_time,
-                                                                         bool non_blocking_read,
-                                                                         const std::string& reverse_ip,
-                                                                         const uint32_t trajectory_port,
-                                                                         const uint32_t script_command_port,
-                                                                         double force_mode_damping,
-                                                                         double force_mode_gain_scaling = 0.5);
+  // Called sigB in tests
+  [[deprecated("Specifying the force mode damping factor and the force mode gain scaling factor at driver creation has "
+               "been deprecated. Force mode parameters should be specified with each activiation of force mode, and "
+               "can be set in the function call to start force mode. This function will be removed in May "
+               "2027.")]]
+  UrDriver(const std::string& robot_ip, const std::string& script_file, const std::string& output_recipe_file,
+           const std::string& input_recipe_file, std::function<void(bool)> handle_program_state, bool headless_mode,
+           std::unique_ptr<ToolCommSetup> tool_comm_setup, const uint32_t reverse_port,
+           const uint32_t script_sender_port, int servoj_gain, double servoj_lookahead_time, bool non_blocking_read,
+           const std::string& reverse_ip, const uint32_t trajectory_port, const uint32_t script_command_port,
+           double force_mode_damping, double force_mode_gain_scaling = 0.5)
+  {
+    UrDriverConfiguration config;
+    config.robot_ip = robot_ip;
+    config.script_file = script_file;
+    config.output_recipe_file = output_recipe_file;
+    config.input_recipe_file = input_recipe_file;
+    config.handle_program_state = handle_program_state;
+    config.headless_mode = headless_mode;
+    config.tool_comm_setup = std::move(tool_comm_setup);
+    config.reverse_port = reverse_port;
+    config.script_sender_port = script_sender_port;
+    config.servoj_gain = servoj_gain;
+    config.servoj_lookahead_time = servoj_lookahead_time;
+    config.non_blocking_read = non_blocking_read;
+    config.reverse_ip = reverse_ip;
+    config.trajectory_port = trajectory_port;
+    config.script_command_port = script_command_port;
+    config.force_mode_damping = force_mode_damping;
+    config.force_mode_gain_scaling = force_mode_gain_scaling;
+    init(config);
+  }
 
   /*!
    * \brief Constructs a new UrDriver object.
@@ -178,13 +246,38 @@ class UrDriver
    * \param force_mode_damping The damping parameter used when the robot is in force mode, range [0,1]
    * \param force_mode_gain_scaling Scales the gain used when the robot is in force mode, range [0,2] (only e-series)
    */
+  // Called sigC in tests
+  [[deprecated("Initializing a UrDriver object with an argument list is deprecated. Please use UrDriver(const "
+               "UrDriverConfiguration& config) instead. This function will be removed in May 2027.")]]
   UrDriver(const std::string& robot_ip, const std::string& script_file, const std::string& output_recipe_file,
            const std::string& input_recipe_file, std::function<void(bool)> handle_program_state, bool headless_mode,
            std::unique_ptr<ToolCommSetup> tool_comm_setup, const std::string& calibration_checksum,
            const uint32_t reverse_port = 50001, const uint32_t script_sender_port = 50002, int servoj_gain = 2000,
            double servoj_lookahead_time = 0.03, bool non_blocking_read = false, const std::string& reverse_ip = "",
            const uint32_t trajectory_port = 50003, const uint32_t script_command_port = 50004,
-           double force_mode_damping = 0.025, double force_mode_gain_scaling = 0.5);
+           double force_mode_damping = 0.025, double force_mode_gain_scaling = 0.5)
+  {
+    UrDriverConfiguration config;
+    config.robot_ip = robot_ip;
+    config.script_file = script_file;
+    config.output_recipe_file = output_recipe_file;
+    config.input_recipe_file = input_recipe_file;
+    config.handle_program_state = handle_program_state;
+    config.headless_mode = headless_mode;
+    config.calibration_checksum = calibration_checksum;
+    config.tool_comm_setup = std::move(tool_comm_setup);
+    config.reverse_port = reverse_port;
+    config.script_sender_port = script_sender_port;
+    config.servoj_gain = servoj_gain;
+    config.servoj_lookahead_time = servoj_lookahead_time;
+    config.non_blocking_read = non_blocking_read;
+    config.reverse_ip = reverse_ip;
+    config.trajectory_port = trajectory_port;
+    config.script_command_port = script_command_port;
+    config.force_mode_damping = force_mode_damping;
+    config.force_mode_gain_scaling = force_mode_gain_scaling;
+    init(config);
+  }
   /*!
    * \brief Constructs a new UrDriver object.
    *
@@ -214,18 +307,36 @@ class UrDriver
    * \param force_mode_damping The damping parameter used when the robot is in force mode, range [0,1]
    * \param force_mode_gain_scaling Scales the gain used when the robot is in force mode, range [0,2] (only e-series)
    */
+  // Called sigD in tests
+  [[deprecated("Initializing a UrDriver object with an argument list is deprecated. Please use UrDriver(const "
+               "UrDriverConfiguration& config) instead. This function will be removed in May 2027.")]]
   UrDriver(const std::string& robot_ip, const std::string& script_file, const std::string& output_recipe_file,
            const std::string& input_recipe_file, std::function<void(bool)> handle_program_state, bool headless_mode,
            const std::string& calibration_checksum = "", const uint32_t reverse_port = 50001,
            const uint32_t script_sender_port = 50002, int servoj_gain = 2000, double servoj_lookahead_time = 0.03,
            bool non_blocking_read = false, const std::string& reverse_ip = "", const uint32_t trajectory_port = 50003,
            const uint32_t script_command_port = 50004, double force_mode_damping = 0.025,
            double force_mode_gain_scaling = 0.5)
-    : UrDriver(robot_ip, script_file, output_recipe_file, input_recipe_file, handle_program_state, headless_mode,
-               std::unique_ptr<ToolCommSetup>{}, calibration_checksum, reverse_port, script_sender_port, servoj_gain,
-               servoj_lookahead_time, non_blocking_read, reverse_ip, trajectory_port, script_command_port,
-               force_mode_damping, force_mode_gain_scaling)
   {
+    UrDriverConfiguration config;
+    config.robot_ip = robot_ip;
+    config.script_file = script_file;
+    config.output_recipe_file = output_recipe_file;
+    config.input_recipe_file = input_recipe_file;
+    config.handle_program_state = handle_program_state;
+    config.headless_mode = headless_mode;
+    config.calibration_checksum = calibration_checksum;
+    config.reverse_port = reverse_port;
+    config.script_sender_port = script_sender_port;
+    config.servoj_gain = servoj_gain;
+    config.servoj_lookahead_time = servoj_lookahead_time;
+    config.non_blocking_read = non_blocking_read;
+    config.reverse_ip = reverse_ip;
+    config.trajectory_port = trajectory_port;
+    config.script_command_port = script_command_port;
+    config.force_mode_damping = force_mode_damping;
+    config.force_mode_gain_scaling = force_mode_gain_scaling;
+    init(config);
   }
 
   virtual ~UrDriver() = default;
@@ -669,6 +780,7 @@ class UrDriver
 
 private:
   static std::string readScriptFile(const std::string& filename);
+  void init(const UrDriverConfiguration& config);
   /*!
    * \brief Reconnects the secondary stream used to send program to the robot.
    *
@@ -709,4 +821,4 @@ class UrDriver
   VersionInformation robot_version_;
 };
 }  // namespace urcl
-#endif  // ifndef UR_CLIENT_LIBRARY_UR_UR_DRIVER_H_INCLUDED
+#endif  // ifndef UR_CLIENT_LIBRARY_UR_UR_DRIVER_H_INCLUDED

src/example_robot_wrapper.cpp

@@ -53,11 +53,15 @@ ExampleRobotWrapper::ExampleRobotWrapper(const std::string& robot_ip, const std:
     throw UrException("Could not initialize robot with dashboard");
   }
 
-  std::unique_ptr<ToolCommSetup> tool_comm_setup;
-  ur_driver_ =
-      std::make_shared<UrDriver>(robot_ip, script_file, output_recipe_file, input_recipe_file,
-                                 std::bind(&ExampleRobotWrapper::handleRobotProgramState, this, std::placeholders::_1),
-                                 headless_mode, std::move(tool_comm_setup));
+  UrDriverConfiguration driver_config;
+  driver_config.robot_ip = robot_ip;
+  driver_config.script_file = script_file;
+  driver_config.output_recipe_file = output_recipe_file;
+  driver_config.input_recipe_file = input_recipe_file;
+  driver_config.handle_program_state =
+      std::bind(&ExampleRobotWrapper::handleRobotProgramState, this, std::placeholders::_1);
+  driver_config.headless_mode = headless_mode;
+  ur_driver_ = std::make_shared<UrDriver>(driver_config);
 
   if (!headless_mode && !std::empty(autostart_program))
   {