Skip to content

Commit f2bfc63

Browse files
authored
actuators: use generic field names (#11)
companion to ign-msgs pr# 129
1 parent 4457dc6 commit f2bfc63

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/convert_builtin_interfaces.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,9 @@ convert_1_to_ign(
292292
convert_1_to_ign(ros1_msg.header, (*ign_msg.mutable_header()));
293293

294294
for (auto i = 0u; i < ros1_msg.angles.size(); ++i)
295-
ign_msg.add_angle(ros1_msg.angles[i]);
295+
ign_msg.add_position(ros1_msg.angles[i]);
296296
for (auto i = 0u; i < ros1_msg.angular_velocities.size(); ++i)
297-
ign_msg.add_angular_velocity(ros1_msg.angular_velocities[i]);
297+
ign_msg.add_velocity(ros1_msg.angular_velocities[i]);
298298
for (auto i = 0u; i < ros1_msg.normalized.size(); ++i)
299299
ign_msg.add_normalized(ros1_msg.normalized[i]);
300300
}
@@ -307,10 +307,10 @@ convert_ign_to_1(
307307
{
308308
convert_ign_to_1(ign_msg.header(), ros1_msg.header);
309309

310-
for (auto i = 0; i < ign_msg.angle_size(); ++i)
311-
ros1_msg.angles.push_back(ign_msg.angle(i));
312-
for (auto i = 0; i < ign_msg.angular_velocity_size(); ++i)
313-
ros1_msg.angular_velocities.push_back(ign_msg.angular_velocity(i));
310+
for (auto i = 0; i < ign_msg.position_size(); ++i)
311+
ros1_msg.angles.push_back(ign_msg.position(i));
312+
for (auto i = 0; i < ign_msg.velocity_size(); ++i)
313+
ros1_msg.angular_velocities.push_back(ign_msg.velocity(i));
314314
for (auto i = 0; i < ign_msg.normalized_size(); ++i)
315315
ros1_msg.normalized.push_back(ign_msg.normalized(i));
316316
}

test/test_utils.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -922,8 +922,8 @@ namespace testing
922922

923923
for (int i = 0u; i < 5; ++i)
924924
{
925-
_msg.add_angle(i);
926-
_msg.add_angular_velocity(i);
925+
_msg.add_position(i);
926+
_msg.add_velocity(i);
927927
_msg.add_normalized(i);
928928
}
929929
}
@@ -937,10 +937,10 @@ namespace testing
937937

938938
compareTestMsg(_msg.header());
939939

940-
for (int i = 0; i < expected_msg.angle_size(); ++i)
940+
for (int i = 0; i < expected_msg.position_size(); ++i)
941941
{
942-
EXPECT_EQ(expected_msg.angle(i), _msg.angle(i));
943-
EXPECT_EQ(expected_msg.angular_velocity(i), _msg.angular_velocity(i));
942+
EXPECT_EQ(expected_msg.position(i), _msg.position(i));
943+
EXPECT_EQ(expected_msg.velocity(i), _msg.velocity(i));
944944
EXPECT_EQ(expected_msg.normalized(i), _msg.normalized(i));
945945
}
946946
}

0 commit comments

Comments
 (0)