diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-01 12:09:16 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-01 12:09:16 +0200 |
| commit | f78ea38d982006389e83382a44baa672834acb6d (patch) | |
| tree | e429b408296920f02156c07ccf1952513c5a401e /src/modules/uORB | |
| parent | db5d668439be63e4c8fd7dab49b81c5e162ee095 (diff) | |
| parent | 2d4dd0d5c03a7ef3d696f40b6a6988e08e991034 (diff) | |
| download | px4-firmware-f78ea38d982006389e83382a44baa672834acb6d.tar.gz px4-firmware-f78ea38d982006389e83382a44baa672834acb6d.tar.bz2 px4-firmware-f78ea38d982006389e83382a44baa672834acb6d.zip | |
Merge remote-tracking branch 'upstream/master' into obcfailsafe
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_global_position.h | 4 | ||||
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/uORB/topics/vehicle_global_position.h b/src/modules/uORB/topics/vehicle_global_position.h index e32529cb4..25137c1c6 100644 --- a/src/modules/uORB/topics/vehicle_global_position.h +++ b/src/modules/uORB/topics/vehicle_global_position.h @@ -70,8 +70,8 @@ struct vehicle_global_position_s { float vel_e; /**< Ground east velocity, m/s */ float vel_d; /**< Ground downside velocity, m/s */ float yaw; /**< Yaw in radians -PI..+PI. */ - float eph; - float epv; + float eph; /**< Standard deviation of position estimate horizontally */ + float epv; /**< Standard deviation of position vertically */ }; /** diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 0751b57fe..301503b82 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -232,6 +232,7 @@ struct vehicle_status_s { uint16_t errors_count4; bool circuit_breaker_engaged_power_check; + bool circuit_breaker_engaged_airspd_check; }; /** |