Skip to content

Commit 89afe6d

Browse files
committed
Formatting
1 parent d7f1fc3 commit 89afe6d

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

include/ur_client_library/ur/ur_driver.h

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,25 @@ class UrDriver
128128
* \param force_mode_damping The damping parameter used when the robot is in force mode, range [0,1]
129129
* \param force_mode_gain_scaling Scales the gain used when the robot is in force mode, range [0,2] (only e-series)
130130
*/
131-
[[deprecated("Specifying the force mode damping factor and the force mode gain scaling factor at driver creation has "
131+
[[deprecated(
132+
"Specifying the force mode damping factor and the force mode gain scaling factor at driver creation has "
132133
"been deprecated. Force mode parameters should be specified with each activiation of force mode, and "
133-
"can be set in the function call to start force mode.")]]
134-
UrDriver(const std::string& robot_ip, const std::string& script_file, const std::string& output_recipe_file,
135-
const std::string& input_recipe_file, std::function<void(bool)> handle_program_state, bool headless_mode,
136-
std::unique_ptr<ToolCommSetup> tool_comm_setup, const uint32_t reverse_port,
137-
const uint32_t script_sender_port, int servoj_gain, double servoj_lookahead_time, bool non_blocking_read,
138-
const std::string& reverse_ip, const uint32_t trajectory_port, const uint32_t script_command_port,
139-
double force_mode_damping, double force_mode_gain_scaling = 0.5);
134+
"can be set in the function call to start force mode.")]] UrDriver(const std::string& robot_ip,
135+
const std::string& script_file,
136+
const std::string& output_recipe_file,
137+
const std::string& input_recipe_file,
138+
std::function<void(bool)> handle_program_state,
139+
bool headless_mode,
140+
std::unique_ptr<ToolCommSetup> tool_comm_setup,
141+
const uint32_t reverse_port,
142+
const uint32_t script_sender_port,
143+
int servoj_gain, double servoj_lookahead_time,
144+
bool non_blocking_read,
145+
const std::string& reverse_ip,
146+
const uint32_t trajectory_port,
147+
const uint32_t script_command_port,
148+
double force_mode_damping,
149+
double force_mode_gain_scaling = 0.5);
140150

141151
/*!
142152
* \brief Constructs a new UrDriver object.
@@ -439,9 +449,9 @@ class UrDriver
439449
* \returns True, if the write was performed successfully, false otherwise.
440450
*/
441451
[[deprecated("Starting force mode without specifying the force mode damping factor and gain scale factor has been "
442-
"deprecated. These values should be given with each function call.")]]
443-
bool startForceMode(const vector6d_t& task_frame, const vector6uint32_t& selection_vector, const vector6d_t& wrench,
444-
const unsigned int type, const vector6d_t& limits);
452+
"deprecated. These values should be given with each function call.")]] bool
453+
startForceMode(const vector6d_t& task_frame, const vector6uint32_t& selection_vector, const vector6d_t& wrench,
454+
const unsigned int type, const vector6d_t& limits);
445455

446456
/*!
447457
* \brief Stop force mode and put the robot into normal operation mode.

src/ur/ur_driver.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ urcl::UrDriver::UrDriver(const std::string& robot_ip, const std::string& script_
142142
}
143143
begin_replace << "set_tool_voltage("
144144
<< static_cast<std::underlying_type<ToolVoltage>::type>(tool_comm_setup->getToolVoltage()) << ")\n";
145-
begin_replace << "set_tool_communication(" << "True" << ", " << tool_comm_setup->getBaudRate() << ", "
145+
begin_replace << "set_tool_communication("
146+
<< "True"
147+
<< ", " << tool_comm_setup->getBaudRate() << ", "
146148
<< static_cast<std::underlying_type<Parity>::type>(tool_comm_setup->getParity()) << ", "
147149
<< tool_comm_setup->getStopBits() << ", " << tool_comm_setup->getRxIdleChars() << ", "
148150
<< tool_comm_setup->getTxIdleChars() << ")";

0 commit comments

Comments
 (0)