diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
| commit | c3cbaf5deb00577efa9198f246ebc6011284ff34 (patch) | |
| tree | 8f40fef6a2230cf6be262443ac520807cc66aba2 /src/modules/uORB/objects_common.cpp | |
| parent | 54e739926d3414e29b13d2aa14ebb94fd8ffd4f4 (diff) | |
| parent | 0b9b68f0d96f59c9cd406547ee52fb52617a298f (diff) | |
| download | px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.gz px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.bz2 px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.zip | |
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
src/drivers/px4io/px4io.cpp
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
| -rw-r--r-- | src/modules/uORB/objects_common.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index 9489550c6..7434df1c3 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -176,13 +176,6 @@ ORB_DEFINE(actuator_controls_3, struct actuator_controls_s); #include "topics/actuator_armed.h" ORB_DEFINE(actuator_armed, struct actuator_armed_s); -/* actuator controls, as set by actuators / mixers after limiting */ -#include "topics/actuator_controls_effective.h" -ORB_DEFINE(actuator_controls_effective_0, struct actuator_controls_effective_s); -ORB_DEFINE(actuator_controls_effective_1, struct actuator_controls_effective_s); -ORB_DEFINE(actuator_controls_effective_2, struct actuator_controls_effective_s); -ORB_DEFINE(actuator_controls_effective_3, struct actuator_controls_effective_s); - #include "topics/actuator_outputs.h" ORB_DEFINE(actuator_outputs_0, struct actuator_outputs_s); ORB_DEFINE(actuator_outputs_1, struct actuator_outputs_s); |