diff options
author | Julian Oes <julian@oes.ch> | 2014-04-07 21:45:45 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2014-04-07 21:45:45 +0200 |
commit | fc2bfb828f0f2ba681da1b33addd03698db4b679 (patch) | |
tree | a133e82429f186e8b7b727092944777f4d0b6d42 /src/modules/uORB/objects_common.cpp | |
parent | 38c3e68976c8dc167b4d1e5d24792401fc7cc7d3 (diff) | |
parent | e4628fbed641496704011b0c488a36ed05b45d5f (diff) | |
download | px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.tar.gz px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.tar.bz2 px4-firmware-fc2bfb828f0f2ba681da1b33addd03698db4b679.zip |
Merge remote-tracking branch 'px4/master' into mavlink_broadcast
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
-rw-r--r-- | src/modules/uORB/objects_common.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index 4b31cc8a4..c8a589bb7 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); |