aboutsummaryrefslogtreecommitdiff
path: root/src/modules/mavlink
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-05-12 09:23:20 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-05-12 09:23:20 +0200
commit08002fbc15d7194a99f527fc21b6cae6398787fa (patch)
tree25696fd340c7b45539f3cb31799c12c114e9ee10 /src/modules/mavlink
parent1795d7d6e1611e9365548bf4395323cdea9ec71d (diff)
downloadpx4-firmware-08002fbc15d7194a99f527fc21b6cae6398787fa.tar.gz
px4-firmware-08002fbc15d7194a99f527fc21b6cae6398787fa.tar.bz2
px4-firmware-08002fbc15d7194a99f527fc21b6cae6398787fa.zip
mavlink receiver: use new manual control setpoint variable names
Diffstat (limited to 'src/modules/mavlink')
-rw-r--r--src/modules/mavlink/mavlink_receiver.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp
index 64fc41838..b03a68c07 100644
--- a/src/modules/mavlink/mavlink_receiver.cpp
+++ b/src/modules/mavlink/mavlink_receiver.cpp
@@ -191,7 +191,7 @@ MavlinkReceiver::handle_message(mavlink_message_t *msg)
}
}
-
+
/* If we've received a valid message, mark the flag indicating so.
This is used in the '-w' command-line flag. */
_mavlink->set_has_received_messages(true);
@@ -438,10 +438,10 @@ MavlinkReceiver::handle_message_manual_control(mavlink_message_t *msg)
memset(&manual, 0, sizeof(manual));
manual.timestamp = hrt_absolute_time();
- manual.pitch = man.x / 1000.0f;
- manual.roll = man.y / 1000.0f;
- manual.yaw = man.r / 1000.0f;
- manual.throttle = man.z / 1000.0f;
+ manual.x = man.x / 1000.0f;
+ manual.y = man.y / 1000.0f;
+ manual.r = man.r / 1000.0f;
+ manual.z = man.z / 1000.0f;
if (_manual_pub < 0) {
_manual_pub = orb_advertise(ORB_ID(manual_control_setpoint), &manual);