diff options
| author | Julian Oes <julian@oes.ch> | 2013-10-11 14:05:11 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-10-11 14:05:11 +0200 |
| commit | 2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66 (patch) | |
| tree | dfe21bf4ddd3b10e2e92cd3d6be206de5a445616 /src/modules/uORB/objects_common.cpp | |
| parent | 326f241185f45d9e2d4377e8096a8a2f05f65b0d (diff) | |
| parent | 1306c9de7b946783ff1143bb42a33734e9380e2c (diff) | |
| download | px4-firmware-2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66.tar.gz px4-firmware-2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66.tar.bz2 px4-firmware-2d23d5fd4ec3a00ae18c63304a3b1b3905d7de66.zip | |
Merge remote-tracking branch 'px4/master' into pwm_ioctls
Conflicts:
src/drivers/px4io/px4io.cpp
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 1eb63a799..3514dca24 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -87,6 +87,9 @@ ORB_DEFINE(safety, struct safety_s); #include "topics/battery_status.h" ORB_DEFINE(battery_status, struct battery_status_s); +#include "topics/servorail_status.h" +ORB_DEFINE(servorail_status, struct servorail_status_s); + #include "topics/vehicle_global_position.h" ORB_DEFINE(vehicle_global_position, struct vehicle_global_position_s); |