diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-21 14:59:55 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-21 14:59:55 +0100 |
commit | ffda224b414204af7fb0a4f660f7b72ee013bcd2 (patch) | |
tree | 3c6ac16cc721ed4daa0fc32b7709758db2f54b54 /apps/uORB/objects_common.cpp | |
parent | d1cde9858d6b8d4c2fb248342e8a3e0aabefa8fd (diff) | |
download | px4-firmware-ffda224b414204af7fb0a4f660f7b72ee013bcd2.tar.gz px4-firmware-ffda224b414204af7fb0a4f660f7b72ee013bcd2.tar.bz2 px4-firmware-ffda224b414204af7fb0a4f660f7b72ee013bcd2.zip |
Added actuator controls effective topic
Diffstat (limited to 'apps/uORB/objects_common.cpp')
-rw-r--r-- | apps/uORB/objects_common.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/uORB/objects_common.cpp b/apps/uORB/objects_common.cpp index c2e82aad9..dbee15050 100644 --- a/apps/uORB/objects_common.cpp +++ b/apps/uORB/objects_common.cpp @@ -113,6 +113,7 @@ ORB_DEFINE(optical_flow, struct optical_flow_s); #include "topics/subsystem_info.h" ORB_DEFINE(subsystem_info, struct subsystem_info_s); +/* actuator controls, as requested by controller */ #include "topics/actuator_controls.h" ORB_DEFINE(actuator_controls_0, struct actuator_controls_s); ORB_DEFINE(actuator_controls_1, struct actuator_controls_s); @@ -120,6 +121,13 @@ ORB_DEFINE(actuator_controls_2, struct actuator_controls_s); ORB_DEFINE(actuator_controls_3, struct actuator_controls_s); 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); |