diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-03 23:19:12 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-03 23:19:12 +0200 |
| commit | f20a9c48732b578acd7164ae5c513c657092ab91 (patch) | |
| tree | 5e2a5fdd21046fddaef848b57a8a7536e30f2c65 /src/modules | |
| parent | dd8bfc2a0b8e528f7e3c93e2dfba5b10bd37091d (diff) | |
| parent | 55cae08cf37c2a67f1ef357f205d2ee5e3208655 (diff) | |
| download | px4-firmware-f20a9c48732b578acd7164ae5c513c657092ab91.tar.gz px4-firmware-f20a9c48732b578acd7164ae5c513c657092ab91.tar.bz2 px4-firmware-f20a9c48732b578acd7164ae5c513c657092ab91.zip | |
Merge remote-tracking branch 'upstream/master' into mtecs
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.cpp | 4 | ||||
| -rw-r--r-- | src/modules/systemlib/mixer/mixer_load.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index 33a4fef12..7c93c1c00 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -432,8 +432,8 @@ MavlinkReceiver::handle_message_manual_control(mavlink_message_t *msg) memset(&manual, 0, sizeof(manual)); manual.timestamp = hrt_absolute_time(); - manual.roll = man.x / 1000.0f; - manual.pitch = man.y / 1000.0f; + manual.pitch = man.x / 1000.0f; + manual.roll = man.y / 1000.0f; manual.yaw = man.r / 1000.0f; manual.throttle = man.z / 1000.0f; diff --git a/src/modules/systemlib/mixer/mixer_load.c b/src/modules/systemlib/mixer/mixer_load.c index b05273c0d..bf3428a50 100644 --- a/src/modules/systemlib/mixer/mixer_load.c +++ b/src/modules/systemlib/mixer/mixer_load.c @@ -41,6 +41,7 @@ #include <string.h> #include <stdio.h> #include <ctype.h> +#include <systemlib/err.h> #include "mixer_load.h" |