Commit 0b64cece authored by carebare47's avatar carebare47
Browse files

lint

parent fa6a1e4c
......@@ -67,7 +67,8 @@ public:
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, bool non_blocking_read = false);
const uint32_t reverse_port = 50001, const uint32_t script_sender_port = 50002,
bool non_blocking_read = false);
/*!
* \brief Constructs a new UrDriver object.
*
......@@ -90,7 +91,8 @@ public:
const std::string& calibration_checksum = "", const uint32_t reverse_port = 50001,
const uint32_t script_sender_port = 50002, bool non_blocking_read = false)
: 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, non_blocking_read)
std::unique_ptr<ToolCommSetup>{}, calibration_checksum, reverse_port, script_sender_port,
non_blocking_read)
{
}
......
......@@ -435,7 +435,8 @@ void HardwareInterface::read(const ros::Time& time, const ros::Duration& period)
}
else
{
if (!non_blocking_read_){
if (!non_blocking_read_)
{
ROS_ERROR("Could not get fresh data package from robot");
}
}
......
......@@ -145,10 +145,10 @@ ur_driver::UrDriver::UrDriver(const std::string& robot_ip, const std::string& sc
std::unique_ptr<rtde_interface::DataPackage> ur_driver::UrDriver::getDataPackage()
{
std::chrono::milliseconds timeout(get_packet_timeout_); // This can take one of two values, 0ms or 100ms. The large
// timeout is for when the robot is commanding the control
// loop's timing (read is blocking). The zero timeout is for
// when the robot is sharing a control loop with
// something else (combined_robot_hw)
// timeout is for when the robot is commanding the control
// loop's timing (read is blocking). The zero timeout is for
// when the robot is sharing a control loop with
// something else (combined_robot_hw)
return rtde_client_->getDataPackage(timeout);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment