fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-30 07:00:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into smooth_pos_hold

Browse Source
This commit is contained in:
Anton Babushkin
2014-05-03 20:05:09 +02:00
parent 7232c0354b 55cae08cf3
commit 4bf8327118
27 changed files with 457 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_receiver.cpp
+2 -2
View File
@@ -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;
src/modules/systemlib/mixer/mixer_load.c
+1
View File
@@ -41,6 +41,7 @@
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include <systemlib/err.h>
#include "mixer_load.h"