diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-21 14:41:03 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-21 14:41:03 +0100 |
| commit | dcdde8ea88bf57b0432d2b64ed3ce606795c8d00 (patch) | |
| tree | 0bf6e997ffe7f7a9cda98c832dbce39601a9242f /msg | |
| parent | 3a38b0fe359296aa19ec43ab82743aebeadb335c (diff) | |
| parent | e8e4a3b5da058bd2ab8575c095dd74a5484333be (diff) | |
| download | px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.tar.gz px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.tar.bz2 px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.zip | |
Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge
Conflicts:
src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp
src/modules/uORB/topics/vehicle_attitude.h
Diffstat (limited to 'msg')
| -rw-r--r-- | msg/vehicle_attitude.msg | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/msg/vehicle_attitude.msg b/msg/vehicle_attitude.msg index dbfd8b6bc..98018a1df 100644 --- a/msg/vehicle_attitude.msg +++ b/msg/vehicle_attitude.msg @@ -16,20 +16,3 @@ float32[4] q # Quaternion (NED) float32[3] g_comp # Compensated gravity vector bool R_valid # Rotation matrix valid bool q_valid # Quaternion valid - -# secondary attitude for VTOL -float32 roll_sec # Roll angle (rad, Tait-Bryan, NED) -float32 pitch_sec # Pitch angle (rad, Tait-Bryan, NED) -float32 yaw_sec # Yaw angle (rad, Tait-Bryan, NED) -float32 rollspeed_sec # Roll angular speed (rad/s, Tait-Bryan, NED) -float32 pitchspeed_sec # Pitch angular speed (rad/s, Tait-Bryan, NED) -float32 yawspeed_sec # Yaw angular speed (rad/s, Tait-Bryan, NED) -float32 rollacc_sec # Roll angular accelration (rad/s, Tait-Bryan, NED) -float32 pitchacc_sec # Pitch angular acceleration (rad/s, Tait-Bryan, NED) -float32 yawacc_sec # Yaw angular acceleration (rad/s, Tait-Bryan, NED) -float32[3] rate_offsets_sec # Offsets of the body angular rates from zero -float32[9] R_sec # Rotation matrix, body to world, (Tait-Bryan, NED) -float32[4] q_sec # Quaternion (NED) -float32[3] g_comp_sec # Compensated gravity vector -bool R_valid_sec # Rotation matrix valid -bool q_valid_sec # Quaternion valid |