diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-26 17:28:01 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-26 17:28:01 +0200 |
| commit | 0fe8ed509ad2d45a16eba1fe2683f586e530ee02 (patch) | |
| tree | ea4454175c5600a411c5828c3278a812dd7563ab /src/modules/uORB/topics/actuator_armed.h | |
| parent | 8ea5fd20c1c268c6baf145606186592bf5bd3699 (diff) | |
| parent | f3a77705a701a92ae510e18280136b3b7f204b3e (diff) | |
| download | px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.tar.gz px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.tar.bz2 px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.zip | |
Merge branch 'master' into power_enforce
Diffstat (limited to 'src/modules/uORB/topics/actuator_armed.h')
| -rw-r--r-- | src/modules/uORB/topics/actuator_armed.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/modules/uORB/topics/actuator_armed.h b/src/modules/uORB/topics/actuator_armed.h index 6e944ffee..a98d3fc3a 100644 --- a/src/modules/uORB/topics/actuator_armed.h +++ b/src/modules/uORB/topics/actuator_armed.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2013 PX4 Development Team. All rights reserved. + * Copyright (c) 2013 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -44,15 +44,25 @@ #include <stdint.h> #include "../uORB.h" +/** + * @addtogroup topics + * @{ + */ + /** global 'actuator output is live' control. */ struct actuator_armed_s { - uint64_t timestamp; - 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) */ + uint64_t timestamp; /**< Microseconds since system boot */ + 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) */ }; +/** + * @} + */ + +/* register this as object request broker structure */ ORB_DECLARE(actuator_armed); #endif
\ No newline at end of file |