diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-22 11:13:11 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-22 11:13:11 +0200 |
| commit | 302233a34f23a57b67d4ebb8ba3e553ad9d8c445 (patch) | |
| tree | 9fa902073c358151e1ca27430e00919048006d76 /src/modules/uORB/objects_common.cpp | |
| parent | dfd9601b571057e73668d9b39d584bc4eb9cc305 (diff) | |
| parent | f0e28a60ca216ec147b359eef5500f190f192c82 (diff) | |
| download | px4-firmware-302233a34f23a57b67d4ebb8ba3e553ad9d8c445.tar.gz px4-firmware-302233a34f23a57b67d4ebb8ba3e553ad9d8c445.tar.bz2 px4-firmware-302233a34f23a57b67d4ebb8ba3e553ad9d8c445.zip | |
Merge branch 'master' into mpc_local_pos
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
| -rw-r--r-- | src/modules/uORB/objects_common.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index 4b31cc8a4..90675bb2e 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -90,6 +90,9 @@ ORB_DEFINE(battery_status, struct battery_status_s); #include "topics/servorail_status.h" ORB_DEFINE(servorail_status, struct servorail_status_s); +#include "topics/system_power.h" +ORB_DEFINE(system_power, struct system_power_s); + #include "topics/vehicle_global_position.h" ORB_DEFINE(vehicle_global_position, struct vehicle_global_position_s); @@ -124,7 +127,7 @@ ORB_DEFINE(position_setpoint_triplet, struct position_setpoint_triplet_s); ORB_DEFINE(vehicle_global_velocity_setpoint, struct vehicle_global_velocity_setpoint_s); #include "topics/mission.h" -ORB_DEFINE(mission, struct mission_s); +ORB_DEFINE(offboard_mission, struct mission_s); ORB_DEFINE(onboard_mission, struct mission_s); #include "topics/mission_result.h" |