Skip to content

Commit a2f0eea

Browse files
Applied clang formatting
1 parent 0a32de2 commit a2f0eea

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

include/ur_client_library/rtde/rtde_client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class RTDEClient
208208
{
209209
return output_recipe_;
210210
}
211-
211+
212212
private:
213213
comm::URStream<RTDEPackage> stream_;
214214
std::vector<std::string> output_recipe_;

src/rtde/rtde_client.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,12 @@ void RTDEClient::queryURControlVersion()
251251
throw UrException(ss.str());
252252
}
253253

254-
void RTDEClient::resetOutputRecipe(const std::vector<std::string> new_recipe) {
254+
void RTDEClient::resetOutputRecipe(const std::vector<std::string> new_recipe)
255+
{
255256
prod_->teardownProducer();
256257
disconnect();
257258

258-
output_recipe_.assign(new_recipe.begin(), new_recipe.end());
259+
output_recipe_.assign(new_recipe.begin(), new_recipe.end());
259260
parser_ = RTDEParser(output_recipe_);
260261
prod_ = std::make_unique<comm::URProducer<RTDEPackage>>(stream_, parser_);
261262
pipeline_ = std::make_unique<comm::Pipeline<RTDEPackage>>(*prod_, PIPELINE_NAME, notifier_, true);
@@ -313,21 +314,23 @@ void RTDEClient::setupOutputs(const uint16_t protocol_version)
313314
{
314315
const std::string variable_name = output_recipe_[i];
315316
URCL_LOG_DEBUG("%s confirmed as datatype: %s", variable_name.c_str(), variable_types[i].c_str());
316-
317+
317318
if (variable_types[i] == "NOT_FOUND")
318319
{
319-
const std::string message = "Variable '" + variable_name + "' not recognized by the robot. "
320-
"Either your output recipe contains errors or the urcontrol version "
321-
"does not support it. It will be removed from the output recipe.";
320+
const std::string message = "Variable '" + variable_name +
321+
"' not recognized by the robot. "
322+
"Either your output recipe contains errors or the urcontrol version "
323+
"does not support it. It will be removed from the output recipe.";
322324
URCL_LOG_WARN("%s", message.c_str());
323-
}
324-
else
325+
}
326+
else
325327
{
326328
available_variables.push_back(variable_name);
327329
}
328330
}
329331

330-
if (available_variables.size() == output_recipe_.size()) {
332+
if (available_variables.size() == output_recipe_.size())
333+
{
331334
// All variables are accounted for in the RTDE package
332335
return;
333336
}

tests/test_rtde_client.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,8 @@ TEST_F(RTDEClientTest, check_all_rtde_output_variables_exist)
373373
{
374374
client_->init();
375375

376-
client_.reset(new rtde_interface::RTDEClient(ROBOT_IP, notifier_, exhaustive_output_recipe_file_, input_recipe_file_));
376+
client_.reset(
377+
new rtde_interface::RTDEClient(ROBOT_IP, notifier_, exhaustive_output_recipe_file_, input_recipe_file_));
377378

378379
EXPECT_NO_THROW(client_->init());
379380
client_->start();

0 commit comments

Comments
 (0)