diff options
author | Julian Oes <julian@oes.ch> | 2013-06-15 20:06:30 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2013-06-15 20:06:30 +0200 |
commit | 3230f2244685252a362f3933707407022d8ea759 (patch) | |
tree | c1455c20f936becea7fc0a2262d206cc6560c055 /src/modules/uORB/objects_common.cpp | |
parent | 9f5565de3221718ba12800a54ca1a0c06b7491ef (diff) | |
parent | 8559315f4f8b6515f2ba9ceadf2aa3b73af41bdc (diff) | |
download | px4-firmware-3230f2244685252a362f3933707407022d8ea759.tar.gz px4-firmware-3230f2244685252a362f3933707407022d8ea759.tar.bz2 px4-firmware-3230f2244685252a362f3933707407022d8ea759.zip |
Merge branch 'pid_fixes' into new_state_machine
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
-rw-r--r-- | src/modules/uORB/objects_common.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index 313fbf641..7dcb9cf93 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -104,6 +104,9 @@ ORB_DEFINE(vehicle_control_mode, struct vehicle_control_mode_s); #include "topics/vehicle_local_position_setpoint.h" ORB_DEFINE(vehicle_local_position_setpoint, struct vehicle_local_position_setpoint_s); +#include "topics/vehicle_bodyframe_speed_setpoint.h" +ORB_DEFINE(vehicle_bodyframe_speed_setpoint, struct vehicle_bodyframe_speed_setpoint_s); + #include "topics/vehicle_global_position_setpoint.h" ORB_DEFINE(vehicle_global_position_setpoint, struct vehicle_global_position_setpoint_s); @@ -122,6 +125,9 @@ ORB_DEFINE(offboard_control_setpoint, struct offboard_control_setpoint_s); #include "topics/optical_flow.h" ORB_DEFINE(optical_flow, struct optical_flow_s); +#include "topics/filtered_bottom_flow.h" +ORB_DEFINE(filtered_bottom_flow, struct filtered_bottom_flow_s); + #include "topics/omnidirectional_flow.h" ORB_DEFINE(omnidirectional_flow, struct omnidirectional_flow_s); |