diff options
| author | Julian Oes <julian@oes.ch> | 2014-07-07 14:49:58 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-07-07 14:49:58 +0200 |
| commit | 79cbf15d2621db38688939ab70eda7ac2fb88cbe (patch) | |
| tree | 91b0843a5c761a5f46a75b64ffae0b78b1414750 /src/modules/uORB | |
| parent | 57f707af56be0d9281a95aebf64baf63ef022267 (diff) | |
| parent | 509180abf6ff9e6a291e34bfb7dbdd105454feb5 (diff) | |
| download | px4-firmware-79cbf15d2621db38688939ab70eda7ac2fb88cbe.tar.gz px4-firmware-79cbf15d2621db38688939ab70eda7ac2fb88cbe.tar.bz2 px4-firmware-79cbf15d2621db38688939ab70eda7ac2fb88cbe.zip | |
Merge branch 'master' into offboard2_merge
Conflicts:
src/modules/commander/commander.cpp
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 | ||||
| -rw-r--r-- | src/modules/uORB/topics/vehicle_gps_position.h | 1 |
3 files changed, 17 insertions, 3 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 */ 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. */ |