Obbart/universal_robots_ros_driver
1
0
Fork 0
mirror of https://gitlab.com/obbart/universal_robots_ros_driver.git synced 2026-04-10 18:10:47 +02:00
Code Releases Activity

Refactored const size arrays to std::array

Browse Source
This commit is contained in:
Simon Rasmussen
2017-03-08 11:00:16 +01:00
parent aa26bb5996
commit e478987dc4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ur_modern_driver/bin_parser.h
View File

@@ -136,7 +136,7 @@ public:
} }
template <typename T, size_t N> template <typename T, size_t N>
void parse(T (&array)[N]) void parse(std::array<T, N> &array)
{ {
for (size_t i = 0; i < N; i++) for (size_t i = 0; i < N; i++)
{ {

28
include/ur_modern_driver/ur/rt_state.h
View File

@@ -23,18 +23,18 @@ protected:
public: public:
double time; double time;
double q_target[6]; std::array<double, 6> q_target;
double qd_target[6]; std::array<double, 6> qd_target;
double qdd_target[6]; std::array<double, 6> qdd_target;
double i_target[6]; std::array<double, 6> i_target;
double m_target[6]; std::array<double, 6> m_target;
double q_actual[6]; std::array<double, 6> q_actual;
double qd_actual[6]; std::array<double, 6> qd_actual;
double i_actual[6]; std::array<double, 6> i_actual;
// gap here depending on version // gap here depending on version
double tcp_force[6]; std::array<double, 6> tcp_force;
// does not contain "_actual" postfix in V1_X but // does not contain "_actual" postfix in V1_X but
// they're the same fields so share anyway // they're the same fields so share anyway
@@ -44,7 +44,7 @@ public:
// gap here depending on version // gap here depending on version
uint64_t digital_inputs; uint64_t digital_inputs;
double motor_temperatures[6]; std::array<double, 6> motor_temperatures;
double controller_time; double controller_time;
double robot_mode; double robot_mode;
@@ -71,7 +71,7 @@ public:
bool parseWith(BinParser& bp); bool parseWith(BinParser& bp);
virtual bool consumeWith(URRTPacketConsumer& consumer); virtual bool consumeWith(URRTPacketConsumer& consumer);
double joint_modes[6]; std::array<double, 6> joint_modes;
static const size_t SIZE = RTState_V1_6__7::SIZE + sizeof(double[6]); static const size_t SIZE = RTState_V1_6__7::SIZE + sizeof(double[6]);
@@ -84,11 +84,11 @@ public:
bool parseWith(BinParser& bp); bool parseWith(BinParser& bp);
virtual bool consumeWith(URRTPacketConsumer& consumer); virtual bool consumeWith(URRTPacketConsumer& consumer);
double i_control[6]; std::array<double, 6> i_control;
cartesian_coord_t tool_vector_target; cartesian_coord_t tool_vector_target;
cartesian_coord_t tcp_speed_target; cartesian_coord_t tcp_speed_target;
double joint_modes[6]; std::array<double, 6> joint_modes;
double safety_mode; double safety_mode;
double3_t tool_accelerometer_values; double3_t tool_accelerometer_values;
double speed_scaling; double speed_scaling;
@@ -96,7 +96,7 @@ public:
double v_main; double v_main;
double v_robot; double v_robot;
double i_robot; double i_robot;
double v_actual[6]; std::array<double, 6> v_actual;
static const size_t SIZE = static const size_t SIZE =
RTShared::SIZE + sizeof(double[6]) * 3 + sizeof(double3_t) + sizeof(cartesian_coord_t) * 2 + sizeof(double) * 6; RTShared::SIZE + sizeof(double[6]) * 3 + sizeof(double3_t) + sizeof(cartesian_coord_t) * 2 + sizeof(double) * 6;