Skip to content

Commit 2ff598e

Browse files
committed
Code formatting
1 parent 1cecc87 commit 2ff598e

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

include/ur_client_library/primary/primary_client.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class PrimaryClient
2828
*
2929
* \param primary_consumer Primary consumer that should be added to the list
3030
*/
31-
void addPrimaryConsumer (std::shared_ptr<comm::IConsumer<PrimaryPackage>> primary_consumer);
31+
void addPrimaryConsumer(std::shared_ptr<comm::IConsumer<PrimaryPackage>> primary_consumer);
3232

3333
/*!
3434
* \brief Remove a primary consumer from the list of consumers
@@ -39,12 +39,12 @@ class PrimaryClient
3939
void start();
4040

4141
/*!
42-
* \brief Retrieves previously raised error codes from PrimaryClient. After calling this, recorded errors will be deleted.
42+
* \brief Retrieves previously raised error codes from PrimaryClient. After calling this, recorded errors will be
43+
* deleted.
4344
*/
4445
std::deque<ErrorCode> getErrorCodes();
4546

4647
private:
47-
4848
// The function is called whenever an error code message is received
4949
void errorMessageCallback(ErrorCode& code);
5050

include/ur_client_library/primary/primary_consumer.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ namespace primary_interface
4747
class PrimaryConsumer : public AbstractPrimaryConsumer
4848
{
4949
public:
50-
PrimaryConsumer() {}
50+
PrimaryConsumer()
51+
{
52+
}
5153
virtual ~PrimaryConsumer() = default;
5254

5355
/*!
@@ -117,8 +119,7 @@ class PrimaryConsumer : public AbstractPrimaryConsumer
117119
code.timestamp = pkg.timestamp_;
118120
code.to_string = pkg.toString();
119121

120-
const auto logContents =
121-
"Logging an ErrorCodeMessage from the UR Controller Box: " + pkg.toString();
122+
const auto logContents = "Logging an ErrorCodeMessage from the UR Controller Box: " + pkg.toString();
122123

123124
switch (code.report_level)
124125
{
@@ -150,7 +151,7 @@ class PrimaryConsumer : public AbstractPrimaryConsumer
150151
return true;
151152
}
152153

153-
/*!
154+
/*!
154155
* \brief Set callback function which will be triggered whenever error code messages are received
155156
*
156157
* \param callback_function Function handling the event information. The error code message received is passed to the
@@ -163,7 +164,6 @@ class PrimaryConsumer : public AbstractPrimaryConsumer
163164

164165
private:
165166
std::function<void(ErrorCode&)> error_code_message_callback_;
166-
167167
};
168168

169169
} // namespace primary_interface

include/ur_client_library/ur/ur_driver.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,8 @@ class UrDriver
536536
bool checkCalibration(const std::string& checksum);
537537

538538
/*!
539-
* \brief Retrieves previously raised error codes from PrimaryClient. After calling this, recorded errors will be deleted.
539+
* \brief Retrieves previously raised error codes from PrimaryClient. After calling this, recorded errors will be
540+
* deleted.
540541
*
541542
* \returns list of error codes
542543
*

src/primary/primary_client.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ PrimaryClient::PrimaryClient(const std::string& robot_ip, comm::INotifier& notif
1313

1414
consumer_.reset(new PrimaryConsumer());
1515
consumer_->setErrorCodeMessageCallback(std::bind(&PrimaryClient::errorMessageCallback, this, std::placeholders::_1));
16-
16+
1717
// Configure multi consumer even though we only have one consumer as default, as this enables the user to add more
1818
// consumers after the object has been created
1919
std::vector<std::shared_ptr<comm::IConsumer<PrimaryPackage>>> consumers;
2020
consumers.push_back(consumer_);
2121
multi_consumer_.reset(new comm::MultiConsumer<PrimaryPackage>(consumers));
22-
23-
pipeline_.reset(new comm::Pipeline<PrimaryPackage>(*prod_, multi_consumer_.get(), "PrimaryClient Pipeline", notifier_));
22+
23+
pipeline_.reset(
24+
new comm::Pipeline<PrimaryPackage>(*prod_, multi_consumer_.get(), "PrimaryClient Pipeline", notifier_));
2425
}
2526

2627
PrimaryClient::~PrimaryClient()

src/ur/ur_driver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ void UrDriver::setupReverseInterface(const uint32_t reverse_port)
729729
reverse_interface_.reset(new control::ReverseInterface(reverse_port, handle_program_state_, step_time));
730730
}
731731

732-
void UrDriver::startPrimaryClientCommunication()
732+
void UrDriver::startPrimaryClientCommunication()
733733
{
734734
primary_client_->start();
735735
}

0 commit comments

Comments
 (0)