Skip to content

Commit 48eea48

Browse files
committed
Formatting again...
1 parent 89afe6d commit 48eea48

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

include/ur_client_library/ur/ur_driver.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -129,24 +129,24 @@ class UrDriver
129129
* \param force_mode_gain_scaling Scales the gain used when the robot is in force mode, range [0,2] (only e-series)
130130
*/
131131
[[deprecated(
132-
"Specifying the force mode damping factor and the force mode gain scaling factor at driver creation has "
133-
"been deprecated. Force mode parameters should be specified with each activiation of force mode, and "
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);
132+
"Specifying the force mode damping factor and the force mode gain scaling factor at driver creation has "
133+
"been deprecated. Force mode parameters should be specified with each activiation of force mode, and "
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);
150150

151151
/*!
152152
* \brief Constructs a new UrDriver object.
@@ -449,7 +449,7 @@ class UrDriver
449449
* \returns True, if the write was performed successfully, false otherwise.
450450
*/
451451
[[deprecated("Starting force mode without specifying the force mode damping factor and gain scale factor has been "
452-
"deprecated. These values should be given with each function call.")]] bool
452+
"deprecated. These values should be given with each function call.")]] bool
453453
startForceMode(const vector6d_t& task_frame, const vector6uint32_t& selection_vector, const vector6d_t& wrench,
454454
const unsigned int type, const vector6d_t& limits);
455455

src/ur/ur_driver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ 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("
146-
<< "True"
145+
begin_replace << "set_tool_communication("
146+
<< "True"
147147
<< ", " << tool_comm_setup->getBaudRate() << ", "
148148
<< static_cast<std::underlying_type<Parity>::type>(tool_comm_setup->getParity()) << ", "
149149
<< tool_comm_setup->getStopBits() << ", " << tool_comm_setup->getRxIdleChars() << ", "

0 commit comments

Comments
 (0)