diff options
| author | Andreas Daniel Antener <antener_a@gmx.ch> | 2015-04-08 14:06:38 +0200 |
|---|---|---|
| committer | Andreas Daniel Antener <antener_a@gmx.ch> | 2015-04-08 14:06:38 +0200 |
| commit | 2d944490760117d90c92fed88edad164451a606a (patch) | |
| tree | d70654ca9399453dee384aed56237bd14494fe75 /src | |
| parent | f8c8876642857520e85ec8ca027146c11b4301e3 (diff) | |
| parent | 120fca61ad2fde5a8967f7dc554d8bd05499593a (diff) | |
| download | px4-firmware-2d944490760117d90c92fed88edad164451a606a.tar.gz px4-firmware-2d944490760117d90c92fed88edad164451a606a.tar.bz2 px4-firmware-2d944490760117d90c92fed88edad164451a606a.zip | |
Merge pull request #1988 from UAVenture/mavros_update
MAVROS update for SITL, updated tests and demo nodes
Diffstat (limited to 'src')
2 files changed, 3 insertions, 3 deletions
diff --git a/src/platforms/ros/nodes/demo_offboard_attitude_setpoints/demo_offboard_attitude_setpoints.cpp b/src/platforms/ros/nodes/demo_offboard_attitude_setpoints/demo_offboard_attitude_setpoints.cpp index fb0b09de1..328f545c6 100644 --- a/src/platforms/ros/nodes/demo_offboard_attitude_setpoints/demo_offboard_attitude_setpoints.cpp +++ b/src/platforms/ros/nodes/demo_offboard_attitude_setpoints/demo_offboard_attitude_setpoints.cpp @@ -49,8 +49,8 @@ DemoOffboardAttitudeSetpoints::DemoOffboardAttitudeSetpoints() : _n(), - _attitude_sp_pub(_n.advertise<geometry_msgs::PoseStamped>("mavros/setpoint/attitude", 1)), - _thrust_sp_pub(_n.advertise<std_msgs::Float64>("mavros/setpoint/att_throttle", 1)) + _attitude_sp_pub(_n.advertise<geometry_msgs::PoseStamped>("mavros/setpoint_attitude/attitude", 1)), + _thrust_sp_pub(_n.advertise<std_msgs::Float64>("mavros/setpoint_attitude/att_throttle", 1)) { } diff --git a/src/platforms/ros/nodes/demo_offboard_position_setpoints/demo_offboard_position_setpoints.cpp b/src/platforms/ros/nodes/demo_offboard_position_setpoints/demo_offboard_position_setpoints.cpp index 125ceaddc..8a626f255 100644 --- a/src/platforms/ros/nodes/demo_offboard_position_setpoints/demo_offboard_position_setpoints.cpp +++ b/src/platforms/ros/nodes/demo_offboard_position_setpoints/demo_offboard_position_setpoints.cpp @@ -46,7 +46,7 @@ DemoOffboardPositionSetpoints::DemoOffboardPositionSetpoints() : _n(), - _local_position_sp_pub(_n.advertise<geometry_msgs::PoseStamped>("mavros/setpoint/local_position", 1)) + _local_position_sp_pub(_n.advertise<geometry_msgs::PoseStamped>("mavros/setpoint_position/local", 1)) { } |