diff options
author | Kynos <mail01@delago.net> | 2014-06-15 12:30:06 +0200 |
---|---|---|
committer | Kynos <mail01@delago.net> | 2014-06-15 12:30:06 +0200 |
commit | 137564b4a6b78c82a4c38ebd02782c531f259c19 (patch) | |
tree | d83e97fca1c3a8e052cf957e6a12b44dc1d8dafa /src/modules/uORB | |
parent | 7724e3d889eecd6733c6e85341a9f0b97faa37cf (diff) | |
parent | 251760679a4bed86fdb10746062fde2cc23e460f (diff) | |
download | px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.tar.gz px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.tar.bz2 px4-firmware-137564b4a6b78c82a4c38ebd02782c531f259c19.zip |
Merge master with the exception of ubx.cpp and ubx.h
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 |