diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-07 08:51:52 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-07 08:51:52 +0200 |
| commit | 58adea94699aa132ee568b9fe61a48f98eb42c78 (patch) | |
| tree | 8b430e1900fd339aef01e77b4299dbde6b106574 /src/modules/uORB/topics | |
| parent | 31474a75fd1ad6e86909bf4af2b484d1decd932a (diff) | |
| parent | 509180abf6ff9e6a291e34bfb7dbdd105454feb5 (diff) | |
| download | px4-firmware-58adea94699aa132ee568b9fe61a48f98eb42c78.tar.gz px4-firmware-58adea94699aa132ee568b9fe61a48f98eb42c78.tar.bz2 px4-firmware-58adea94699aa132ee568b9fe61a48f98eb42c78.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/commander/commander.cpp
Diffstat (limited to 'src/modules/uORB/topics')
| -rw-r--r-- | src/modules/uORB/topics/telemetry_status.h | 14 | ||||
| -rw-r--r-- | src/modules/uORB/topics/vehicle_gps_position.h | 1 |
2 files changed, 13 insertions, 2 deletions
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 */ diff --git a/src/modules/uORB/topics/vehicle_gps_position.h b/src/modules/uORB/topics/vehicle_gps_position.h index dbd59f4f3..80d65cd69 100644 --- a/src/modules/uORB/topics/vehicle_gps_position.h +++ b/src/modules/uORB/topics/vehicle_gps_position.h @@ -61,7 +61,6 @@ struct vehicle_gps_position_s { uint64_t timestamp_variance; float s_variance_m_s; /**< speed accuracy estimate m/s */ - float p_variance_m; /**< position accuracy estimate m */ float c_variance_rad; /**< course accuracy estimate rad */ uint8_t fix_type; /**< 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix. */ |