Skip to content

Commit 4ad0056

Browse files
ur_controllers: Update RealTimeBox (#1189)
The realtime_box API has been changed. This PR updates the controllers to that update.
1 parent ca5fb3e commit 4ad0056

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

ur_controllers/include/ur_controllers/ur_configuration_controller.hpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,10 @@
4141
#ifndef UR_CONTROLLERS__UR_CONFIGURATION_CONTROLLER_HPP_
4242
#define UR_CONTROLLERS__UR_CONFIGURATION_CONTROLLER_HPP_
4343

44-
// TODO(fmauch): Currently, the realtime_box_best_effort doesn't include this
45-
#include <functional>
46-
#include <realtime_tools/realtime_box_best_effort.h> // NOLINT
47-
4844
#include <memory>
4945

5046
#include <controller_interface/controller_interface.hpp>
47+
#include <realtime_tools/realtime_box.h>
5148

5249
#include "ur_msgs/srv/get_robot_software_version.hpp"
5350
#include "ur_configuration_controller_parameters.hpp"
@@ -88,7 +85,7 @@ class URConfigurationController : public controller_interface::ControllerInterfa
8885
CallbackReturn on_init() override;
8986

9087
private:
91-
realtime_tools::RealtimeBoxBestEffort<std::shared_ptr<VersionInformation>> robot_software_version_{
88+
realtime_tools::RealtimeBox<std::shared_ptr<VersionInformation>> robot_software_version_{
9289
std::make_shared<VersionInformation>()
9390
};
9491

ur_controllers/src/ur_configuration_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ bool URConfigurationController::getRobotSoftwareVersion(
114114
ur_msgs::srv::GetRobotSoftwareVersion::Response::SharedPtr resp)
115115
{
116116
std::shared_ptr<VersionInformation> temp;
117-
return robot_software_version_.tryGet([resp](const std::shared_ptr<VersionInformation> ptr) {
117+
return robot_software_version_.try_get([resp](const std::shared_ptr<VersionInformation> ptr) {
118118
resp->major = ptr->major;
119119
resp->minor = ptr->minor;
120120
resp->build = ptr->build;

0 commit comments

Comments
 (0)