diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-11 17:53:42 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-11 17:53:42 +0100 |
| commit | 5a39a4cbd4621fa64d430e7881dcac57928f337f (patch) | |
| tree | 01b6e45b876a4f513082d27174e0f6249f756788 /src/modules/uORB | |
| parent | ebab4bfa7ef9ca138ac476943a87b8e3244b9a21 (diff) | |
| parent | 0bcda7f8a6079ba20eeb4bbd4181872a5513acfc (diff) | |
| download | px4-firmware-5a39a4cbd4621fa64d430e7881dcac57928f337f.tar.gz px4-firmware-5a39a4cbd4621fa64d430e7881dcac57928f337f.tar.bz2 px4-firmware-5a39a4cbd4621fa64d430e7881dcac57928f337f.zip | |
Merged mavlink_beta2
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/mission_result.h | 3 | ||||
| -rwxr-xr-x | src/modules/uORB/topics/vehicle_attitude.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/uORB/topics/mission_result.h b/src/modules/uORB/topics/mission_result.h index c99706b97..7c3921198 100644 --- a/src/modules/uORB/topics/mission_result.h +++ b/src/modules/uORB/topics/mission_result.h @@ -54,7 +54,8 @@ struct mission_result_s { bool mission_reached; /**< true if mission has been reached */ - unsigned mission_index; /**< index of the mission which has been reached */ + unsigned mission_index_reached; /**< index of the mission which has been reached */ + unsigned index_current_mission; /**< index of the current mission */ }; /** diff --git a/src/modules/uORB/topics/vehicle_attitude.h b/src/modules/uORB/topics/vehicle_attitude.h index e5a35ff9b..40328af14 100755 --- a/src/modules/uORB/topics/vehicle_attitude.h +++ b/src/modules/uORB/topics/vehicle_attitude.h @@ -76,7 +76,7 @@ struct vehicle_attitude_s { float rate_offsets[3]; /**< Offsets of the body angular rates from zero */ float R[3][3]; /**< Rotation matrix body to world, (Tait-Bryan, NED) */ float q[4]; /**< Quaternion (NED) */ - float g_comp[3]; /**< Compensated gravity vector */ + float g_comp[3]; /**< Compensated gravity vector */ bool R_valid; /**< Rotation matrix valid */ bool q_valid; /**< Quaternion valid */ |