aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB/objects_common.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-02-13 23:19:43 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-02-28 15:19:15 +0100
commit2b2f7e9407a551682fc76401462e08df9871cc98 (patch)
treec6d97c9ea6a6435baede3db09c1b5653766edf71 /src/modules/uORB/objects_common.cpp
parent19811bc73fb87662bd4e2a2145d3c4f5bc5aa201 (diff)
downloadpx4-firmware-2b2f7e9407a551682fc76401462e08df9871cc98.tar.gz
px4-firmware-2b2f7e9407a551682fc76401462e08df9871cc98.tar.bz2
px4-firmware-2b2f7e9407a551682fc76401462e08df9871cc98.zip
introduce offboard control mode topic
Replace offboard_control_setpoint with offboard_control_mode Remove all setpoint data from the topic as it's not used anymore (setpoint data is directly routed into position/attitude setpoint topics for some time now) Remove mode enum and replace with ignore booleans which map better to the mavlink message Mavlink: Rework parsing of offboard setpoints Commander: in offboard mode set control flags based on ignore flags instead of enum
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
-rw-r--r--src/modules/uORB/objects_common.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp
index f60aa8d86..dbed29774 100644
--- a/src/modules/uORB/objects_common.cpp
+++ b/src/modules/uORB/objects_common.cpp
@@ -163,8 +163,8 @@ ORB_DEFINE(manual_control_setpoint, struct manual_control_setpoint_s);
#include "topics/vehicle_control_debug.h"
ORB_DEFINE(vehicle_control_debug, struct vehicle_control_debug_s);
-#include "topics/offboard_control_setpoint.h"
-ORB_DEFINE(offboard_control_setpoint, struct offboard_control_setpoint_s);
+#include "topics/offboard_control_mode.h"
+ORB_DEFINE(offboard_control_mode, struct offboard_control_mode_s);
#include "topics/optical_flow.h"
ORB_DEFINE(optical_flow, struct optical_flow_s);