diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-29 08:00:12 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-29 08:00:12 +0100 |
| commit | f4e0dc2857da7a8b42b7439ae57310b23c902cd9 (patch) | |
| tree | d31b6697458c5f54672ea6b5bbc3a267e6fa1be5 /src/lib/conversion/rotation.cpp | |
| parent | acb4844939f971a1a33515316f5e6c7c8f668f12 (diff) | |
| parent | 22f744f0e17f83a706998381d1977c9cb24d457a (diff) | |
| download | px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.gz px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.bz2 px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitmodules
Diffstat (limited to 'src/lib/conversion/rotation.cpp')
| -rw-r--r-- | src/lib/conversion/rotation.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/conversion/rotation.cpp b/src/lib/conversion/rotation.cpp index e17715733..1fe36d395 100644 --- a/src/lib/conversion/rotation.cpp +++ b/src/lib/conversion/rotation.cpp @@ -181,6 +181,11 @@ rotate_3f(enum Rotation rot, float &x, float &y, float &z) x = tmp; return; } + case ROTATION_ROLL_270_YAW_270: { + tmp = z; z = -y; y = tmp; + tmp = x; x = y; y = -tmp; + return; + } case ROTATION_PITCH_90: { tmp = z; z = -x; x = tmp; return; |