Skip to content

Commit 7acf875

Browse files
authored
Add unitary quaternion pose_values in test
1 parent 07e0047 commit 7acf875

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

pose_broadcaster/test/test_pose_broadcaster.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,8 @@ class PoseBroadcasterTest : public ::testing::Test
3939
const std::string frame_id_ = "pose_base_frame";
4040
const std::string tf_child_frame_id_ = "pose_frame";
4141

42-
<<<<<<< HEAD
43-
std::array<double, 7> pose_values_ = {1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7};
44-
=======
4542
std::array<double, 7> pose_values_ = {
4643
{1.1, 2.2, 3.3, 0.39190382, 0.20056212, 0.53197575, 0.72331744}};
47-
>>>>>>> 67096bd ([pose_broadcaster] Check for valid pose before attempting to publish a tf for it (#1479))
4844

4945
hardware_interface::StateInterface pose_position_x_{pose_name_, "position.x", &pose_values_[0]};
5046
hardware_interface::StateInterface pose_position_y_{pose_name_, "position.x", &pose_values_[1]};

0 commit comments

Comments
 (0)