diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-03 16:04:39 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-03 16:04:39 +0200 |
| commit | d1d03c34b9c649cdf382a6b2d5985260c3688ec5 (patch) | |
| tree | 5661a36a8921147f8b90baa9488d173c2ed07148 /src/modules/uORB | |
| parent | 854bb7fe089daf8bf3d4e9f2cac1cb2b99a67ac7 (diff) | |
| parent | da5b60adab798710f8f61940edfee73a1c46542a (diff) | |
| download | px4-firmware-d1d03c34b9c649cdf382a6b2d5985260c3688ec5.tar.gz px4-firmware-d1d03c34b9c649cdf382a6b2d5985260c3688ec5.tar.bz2 px4-firmware-d1d03c34b9c649cdf382a6b2d5985260c3688ec5.zip | |
Merge remote-tracking branch 'px4/master' into navigator_rewrite
Conflicts:
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'src/modules/uORB')
| -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 |