diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-08 13:42:40 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-08 13:42:40 +0100 |
commit | 356e6f1eebfba8bc8630299ef091570f0c337ba5 (patch) | |
tree | 62e0fed230e934dd4de426a3443f807bc1e4a077 /src | |
parent | b93fcca4339edc5312158dc4a70bf8abf2c8bb4b (diff) | |
download | px4-firmware-356e6f1eebfba8bc8630299ef091570f0c337ba5.tar.gz px4-firmware-356e6f1eebfba8bc8630299ef091570f0c337ba5.tar.bz2 px4-firmware-356e6f1eebfba8bc8630299ef091570f0c337ba5.zip |
WIP, move some ORB defines
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/uORB/uORB.h | 9 | ||||
-rw-r--r-- | src/platforms/px4_defines.h | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/uORB/uORB.h b/src/modules/uORB/uORB.h index 82ff46ad2..578ebf9dd 100644 --- a/src/modules/uORB/uORB.h +++ b/src/modules/uORB/uORB.h @@ -125,7 +125,7 @@ typedef intptr_t orb_advert_t; * node in /obj if required and publishes the initial data. * * Any number of advertisers may publish to a topic; publications are atomic - * but co-ordination between publishers is not provided by the ORB. + * but co-ordination between publishers is not provided by the ORB. * * @param meta The uORB metadata (usually from the ORB_ID() macro) * for the topic. @@ -261,4 +261,11 @@ extern int orb_set_interval(int handle, unsigned interval) __EXPORT; __END_DECLS +/* Diverse uORB header defines */ //XXX: move to better location +#define ORB_ID_VEHICLE_ATTITUDE_CONTROLS ORB_ID(actuator_controls_0) +ORB_DECLARE(actuator_controls_0); +ORB_DECLARE(actuator_controls_1); +ORB_DECLARE(actuator_controls_2); +ORB_DECLARE(actuator_controls_3); + #endif /* _UORB_UORB_H */ diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h index daeff9cf3..ff302448a 100644 --- a/src/platforms/px4_defines.h +++ b/src/platforms/px4_defines.h @@ -139,10 +139,3 @@ typedef param_t px4_param_t; /* wrapper for rotation matrices stored in arrays */ #define PX4_R(_array, _x, _y) PX4_ARRAY2D(_array, 3, _x, _y) - -/* Diverese uORB header defiens */ //XXX: move to better location -#define ORB_ID_VEHICLE_ATTITUDE_CONTROLS ORB_ID(actuator_controls_0) -ORB_DECLARE(actuator_controls_0); -ORB_DECLARE(actuator_controls_1); -ORB_DECLARE(actuator_controls_2); -ORB_DECLARE(actuator_controls_3); |