diff options
author | px4dev <px4@purgatory.org> | 2012-08-05 13:43:16 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-08-05 14:13:34 -0700 |
commit | 9804447a66391a1e216068cbd849e0011c851f7a (patch) | |
tree | 290375f61f5fcab6a837f39e45e65cb5fbce3308 /apps/uORB/objects_common.cpp | |
parent | 9804776a0c8bd67d4a533e3302f1a598c35b868b (diff) | |
download | px4-firmware-9804447a66391a1e216068cbd849e0011c851f7a.tar.gz px4-firmware-9804447a66391a1e216068cbd849e0011c851f7a.tar.bz2 px4-firmware-9804447a66391a1e216068cbd849e0011c851f7a.zip |
More work on the mixer architecture.
Solve the multiple publishers issue with 'control groups', one group per controller. Mixer inputs now specify both group and control offset within the group.
Avoid using %f when loading/saving mixers; use scaled integers instead.
Diffstat (limited to 'apps/uORB/objects_common.cpp')
-rw-r--r-- | apps/uORB/objects_common.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/uORB/objects_common.cpp b/apps/uORB/objects_common.cpp index 78708cdba..98e6c2987 100644 --- a/apps/uORB/objects_common.cpp +++ b/apps/uORB/objects_common.cpp @@ -32,7 +32,9 @@ ****************************************************************************/ /** - * @file Common object definitions without a better home. + * @file objects_common.h + * + * Common object definitions without a better home. */ #include <nuttx/config.h> @@ -101,5 +103,8 @@ ORB_DEFINE(vehicle_global_position_setpoint, struct vehicle_global_position_setp ORB_DEFINE(vehicle_attitude_setpoint, struct vehicle_attitude_s); #include "topics/actuator_controls.h" -ORB_DEFINE(actuator_controls, struct actuator_controls_s); +ORB_DEFINE(actuator_controls_0, struct actuator_controls_s); +ORB_DEFINE(actuator_controls_1, struct actuator_controls_s); +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); |