diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:08:39 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:11:05 +0100 |
| commit | 16618f1adac7f33817fb968b285288beb360b012 (patch) | |
| tree | b6181cbd01cb923023810b735c4bc6cb40c58b8e /msg/vehicle_attitude.msg | |
| parent | 4402d7106bc63b2a02a1e4c22f54e072b3c48fc7 (diff) | |
| parent | 6e874bed50d6d8a13a3b7f9b883697cb2718d27b (diff) | |
| download | px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.gz px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.bz2 px4-firmware-16618f1adac7f33817fb968b285288beb360b012.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
src/examples/subscriber/subscriber_params.c
src/modules/mc_att_control/mc_att_control_main.cpp
src/modules/uORB/topics/vehicle_attitude.h
src/modules/uORB/topics/vehicle_attitude_setpoint.h
src/platforms/px4_middleware.h
Diffstat (limited to 'msg/vehicle_attitude.msg')
| -rw-r--r-- | msg/vehicle_attitude.msg | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/msg/vehicle_attitude.msg b/msg/vehicle_attitude.msg index 98018a1df..dbfd8b6bc 100644 --- a/msg/vehicle_attitude.msg +++ b/msg/vehicle_attitude.msg @@ -16,3 +16,20 @@ 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 |