diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-07 15:09:16 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-07 15:09:16 +0200 |
| commit | 9a69c7ba0e688b3d020c2bd740dfd24187d95865 (patch) | |
| tree | a31d4fed1c15e2c2a0ee97d81cd12ea6aad96f1c /src/modules/uORB | |
| parent | 3f307fa0d7d6e8901eefca28dac039af69a0a92b (diff) | |
| parent | be73ad0bdb932e35cf891e8f5ffc1b89fdd683dc (diff) | |
| download | px4-firmware-9a69c7ba0e688b3d020c2bd740dfd24187d95865.tar.gz px4-firmware-9a69c7ba0e688b3d020c2bd740dfd24187d95865.tar.bz2 px4-firmware-9a69c7ba0e688b3d020c2bd740dfd24187d95865.zip | |
Merge branch 'master' into dataman_nav_drton
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/objects_common.cpp | 5 | ||||
| -rw-r--r-- | src/modules/uORB/topics/telemetry_status.h | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index 687fc1d4a..9b118205e 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -186,7 +186,10 @@ ORB_DEFINE(actuator_outputs_2, struct actuator_outputs_s); ORB_DEFINE(actuator_outputs_3, struct actuator_outputs_s); #include "topics/telemetry_status.h" -ORB_DEFINE(telemetry_status, struct telemetry_status_s); +ORB_DEFINE(telemetry_status_0, struct telemetry_status_s); +ORB_DEFINE(telemetry_status_1, struct telemetry_status_s); +ORB_DEFINE(telemetry_status_2, struct telemetry_status_s); +ORB_DEFINE(telemetry_status_3, struct telemetry_status_s); #include "topics/debug_key_value.h" ORB_DEFINE(debug_key_value, struct debug_key_value_s); diff --git a/src/modules/uORB/topics/telemetry_status.h b/src/modules/uORB/topics/telemetry_status.h index e9e00d76c..c4b99d520 100644 --- a/src/modules/uORB/topics/telemetry_status.h +++ b/src/modules/uORB/topics/telemetry_status.h @@ -72,6 +72,18 @@ struct telemetry_status_s { * @} */ -ORB_DECLARE(telemetry_status); +ORB_DECLARE(telemetry_status_0); +ORB_DECLARE(telemetry_status_1); +ORB_DECLARE(telemetry_status_2); +ORB_DECLARE(telemetry_status_3); + +#define TELEMETRY_STATUS_ORB_ID_NUM 4 + +static const struct orb_metadata *telemetry_status_orb_id[TELEMETRY_STATUS_ORB_ID_NUM] = { + ORB_ID(telemetry_status_0), + ORB_ID(telemetry_status_1), + ORB_ID(telemetry_status_2), + ORB_ID(telemetry_status_3), +}; #endif /* TOPIC_TELEMETRY_STATUS_H */ |