Merge remote-tracking branch 'upstream/master' into linux

Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	makefiles/firmware.mk
	src/modules/commander/module.mk
	src/modules/mavlink/mavlink_ftp.h
	src/modules/mavlink/mavlink_tests/module.mk
This commit is contained in:
Mark Charlebois
2015-05-04 16:36:59 -07:00
24 changed files with 916 additions and 420 deletions
+3 -3
View File
@@ -306,17 +306,17 @@ Gimbal::cycle()
orb_copy(ORB_ID(vehicle_attitude), _att_sub, &att);
if (_attitude_compensation_roll) {
roll = -att.roll;
roll = 1.0f / M_PI_F * -att.roll;
updated = true;
}
if (_attitude_compensation_pitch) {
pitch = -att.pitch;
pitch = 1.0f / M_PI_F * -att.pitch;
updated = true;
}
if (_attitude_compensation_yaw) {
yaw = att.yaw;
yaw = 1.0f / M_PI_F * att.yaw;
updated = true;
}