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

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

Browse Source 
Conflicts:
	src/modules/uORB/objects_common.cpp
This commit is contained in:
Thomas Gubler
2014-06-30 09:53:07 +02:00
parent 3ddb502d2e 28a31708f9
commit ffb0ebf13c
105 changed files with 9479 additions and 3690 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/objects_common.cpp
+6
View File
@@ -202,3 +202,9 @@ ORB_DEFINE(estimator_status, struct estimator_status_report);
#include "topics/vehicle_force_setpoint.h"
ORB_DEFINE(vehicle_force_setpoint, struct vehicle_force_setpoint_s);
#include "topics/tecs_status.h"
ORB_DEFINE(tecs_status, struct tecs_status_s);
#include "topics/wind_estimate.h"
ORB_DEFINE(wind_estimate, struct wind_estimate_s);