Skip to content

Commit d88cb2e

Browse files
Lu, Bethany(Data61, Pullenvale)Lu, Bethany(Data61, Pullenvale)
authored andcommitted
Changed syropod_manipulation topic name.
1 parent 1d1e121 commit d88cb2e

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

include/syropod_highlevel_controller/state_controller.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,14 @@ class StateController
217217
/// @param[in] input The Point geometry message provided by the topic "syropod_remote/secondary_tip_velocity"
218218
void secondaryTipVelocityInputCallback(const geometry_msgs::Point &input);
219219

220-
/// Callback for the input manual tip position (in cartesian space) for the primary selected leg.
221-
/// @param[in] input The Pose geometry message provided by the subscribed topic "/syropod_manipulation/primary/pose"
220+
/// Callback for the input manual tip pose (in cartesian space) for the primary selected leg.
221+
/// @param[in] input The Pose geometry message provided by the subscribed topic
222+
/// "/syropod_manipulation/primary_tip_pose"
222223
void primaryTipPoseInputCallback(const geometry_msgs::Pose &msg);
223224

224-
/// Callback for the input manual tip position (in cartesian space) for the secondary selected leg.
225-
/// @param[in] input The Pose geometry message provided by the subscribed topic "/syropod_manipulation/secondary/Ppse"
225+
/// Callback for the input manual tip pose (in cartesian space) for the secondary selected leg.
226+
/// @param[in] input The Pose geometry message provided by the subscribed topic
227+
/// "/syropod_manipulation/secondary_tip_pose"
226228
void secondaryTipPoseInputCallback(const geometry_msgs::Pose &msg);
227229

228230
/// Callback handling the desired parameter selection and sending state messages to user interface.
@@ -289,8 +291,8 @@ class StateController
289291
ros::Subscriber parameter_selection_subscriber_; ///< Subscriber for topic /syropod_remote/parameter_selection
290292
ros::Subscriber parameter_adjustment_subscriber_; ///< Subscriber for topic /syropod_remote/parameter_adjustment
291293

292-
ros::Subscriber primary_tip_pose_subscriber_; ///< Subscriber for topic /syropod_manipulation/primary/pose
293-
ros::Subscriber secondary_tip_pose_subscriber_; ///< Subscriber for topic /syropod_manipulation/secondary/pose
294+
ros::Subscriber primary_tip_pose_subscriber_; ///< Subscriber for topic /syropod_manipulation/primary_tip_pose
295+
ros::Subscriber secondary_tip_pose_subscriber_; ///< Subscriber for topic /syropod_manipulation/secondary_tip_pose
294296

295297
ros::Subscriber target_configuration_subscriber_; ///< Subscriber for topic /target_configuration
296298
ros::Subscriber target_body_pose_subscriber_; ///< Subscriber for topic /target_body_pose

readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ For information on parameters see readme in config folder.
9999

100100
### Syropod Manipulation:
101101
* AR Leg Tip Position:
102-
* Description: The desired position of leg AR in Cartesian space.
103-
* Topic: */syropod_manipulation/primary/Pose*
102+
* Description: The desired pose of leg AR in Cartesian space.
103+
* Topic: */syropod_manipulation/primary_tip_pose*
104104
* Type: geometry_msgs::Pose
105105

106106
* AL Leg Tip Position:
107-
* Description: The desired position of leg AL in Cartesian space.
108-
* Topic: */syropod_manipulation/secondary/Pose*
107+
* Description: The desired pose of leg AL in Cartesian space.
108+
* Topic: */syropod_manipulation/secondary_tip_pose*
109109
* Type: geometry_msgs::Pose
110110

111111
### Motor and Sensor Inputs

src/state_controller.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ StateController::StateController(void)
6363
&StateController::parameterSelectionCallback, this);
6464
parameter_adjustment_subscriber_ = n.subscribe("syropod_remote/parameter_adjustment", 1,
6565
&StateController::parameterAdjustCallback, this);
66-
66+
6767
// Hexapod Leg Manipulation topic subscriptions
68-
primary_tip_pose_subscriber_ = n.subscribe("/syropod_manipulation/primary/pose", 1,
68+
primary_tip_pose_subscriber_ = n.subscribe("/syropod_manipulation/primary_tip_pose", 1,
6969
&StateController::primaryTipPoseInputCallback, this);
70-
secondary_tip_pose_subscriber_ = n.subscribe("/syropod_manipulation/secondary/pose", 1,
70+
secondary_tip_pose_subscriber_ = n.subscribe("/syropod_manipulation/secondary_tip_pose", 1,
7171
&StateController::secondaryTipPoseInputCallback, this);
7272

7373
// Planner subscription/publisher

0 commit comments

Comments
 (0)