diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-03 10:32:01 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-03 10:32:01 +0100 |
| commit | 5cefd4811f7913402baabf93939ed4fbf4727654 (patch) | |
| tree | 5e97cf7a45c4c5b7fd6e01e05e2ec87bd2aaf2aa /src/modules/uORB/topics/actuator_controls.h | |
| parent | 7bb583d6e21a0fa7e51f147d23997aaeb7e218c9 (diff) | |
| parent | 3dd3ba4637bfe6d665f20c1e5712ac22131b5b22 (diff) | |
| download | px4-firmware-5cefd4811f7913402baabf93939ed4fbf4727654.tar.gz px4-firmware-5cefd4811f7913402baabf93939ed4fbf4727654.tar.bz2 px4-firmware-5cefd4811f7913402baabf93939ed4fbf4727654.zip | |
Merged with master, cleanup of varlength prototypemavlink_variable_length
Diffstat (limited to 'src/modules/uORB/topics/actuator_controls.h')
| -rw-r--r-- | src/modules/uORB/topics/actuator_controls.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/modules/uORB/topics/actuator_controls.h b/src/modules/uORB/topics/actuator_controls.h index b7c4196c0..e768ab2f6 100644 --- a/src/modules/uORB/topics/actuator_controls.h +++ b/src/modules/uORB/topics/actuator_controls.h @@ -52,27 +52,27 @@ #define NUM_ACTUATOR_CONTROLS 8 #define NUM_ACTUATOR_CONTROL_GROUPS 4 /**< for sanity checking */ +/* control sets with pre-defined applications */ +#define ORB_ID_VEHICLE_ATTITUDE_CONTROLS ORB_ID(actuator_controls_0) + +/** + * @addtogroup topics + * @{ + */ + struct actuator_controls_s { uint64_t timestamp; float control[NUM_ACTUATOR_CONTROLS]; }; +/** + * @} + */ + /* actuator control sets; this list can be expanded as more controllers emerge */ ORB_DECLARE(actuator_controls_0); ORB_DECLARE(actuator_controls_1); ORB_DECLARE(actuator_controls_2); ORB_DECLARE(actuator_controls_3); -/* control sets with pre-defined applications */ -#define ORB_ID_VEHICLE_ATTITUDE_CONTROLS ORB_ID(actuator_controls_0) - -/** global 'actuator output is live' control. */ -struct actuator_armed_s { - bool armed; /**< Set to true if system is armed */ - bool ready_to_arm; /**< Set to true if system is ready to be armed */ - bool lockdown; /**< Set to true if actuators are forced to being disabled (due to emergency or HIL) */ -}; - -ORB_DECLARE(actuator_armed); - -#endif
\ No newline at end of file +#endif |