Skip to content

Commit 3d869f0

Browse files
committed
Added placeholder for industrial_robot_status_interface
1 parent f507f59 commit 3d869f0

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

ur_robot_driver/include/ur_robot_driver/hardware_interface.h

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
// ROS
4848
#include "rclcpp/macros.hpp"
4949

50+
#include "ur_robot_driver/robot_status_interface.h"
51+
5052
using hardware_interface::Actuator;
5153
using hardware_interface::HardwareInfo;
5254
using hardware_interface::return_type;
@@ -127,32 +129,7 @@ class URPositionHardwareInterface : public hardware_interface::SystemInterface
127129
urcl::vector6d_t urcl_ft_sensor_measurements_;
128130
urcl::vector6d_t urcl_tcp_pose_;
129131

130-
// TODO exchange for industrial robot status interface
131-
enum class TriState : int8_t
132-
{
133-
UNKNOWN = -1,
134-
FALSE = 0,
135-
TRUE = 1,
136-
};
137-
enum class RobotMode : int8_t
138-
{
139-
UNKNOWN = -1,
140-
MANUAL = 1,
141-
AUTO = 2,
142-
};
143-
typedef std::int32_t ErrorCode;
144-
struct RobotStatus
145-
{
146-
RobotMode mode;
147-
TriState e_stopped;
148-
TriState drives_powered;
149-
TriState motion_possible;
150-
TriState in_motion;
151-
TriState in_error;
152-
ErrorCode error_code;
153-
};
154132
RobotStatus robot_status_resource_{};
155-
// END TODO
156133

157134
bool packet_read_;
158135

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#pragma once
2+
3+
// TODO Redefinition of industrial_robot_status_interface
4+
// Exchange as soon as it is released for Foxy
5+
6+
enum class TriState : int8_t
7+
{
8+
UNKNOWN = -1,
9+
FALSE = 0,
10+
TRUE = 1,
11+
};
12+
enum class RobotMode : int8_t
13+
{
14+
UNKNOWN = -1,
15+
MANUAL = 1,
16+
AUTO = 2,
17+
};
18+
typedef std::int32_t ErrorCode;
19+
struct RobotStatus
20+
{
21+
RobotMode mode;
22+
TriState e_stopped;
23+
TriState drives_powered;
24+
TriState motion_possible;
25+
TriState in_motion;
26+
TriState in_error;
27+
ErrorCode error_code;
28+
};

0 commit comments

Comments
 (0)