dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

delete ROTATION_YAW_293_PITCH_68_ROLL_90 as usage implies it is the same as ROTATION_ROLL_90_PITCH_68_YAW_293

This commit is contained in:
baumanta 2020-04-30 10:27:14 +02:00 committed by Daniel Agar
parent 38a6304d53
commit 200d905b63
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/conversion/rotation.cpp
View File

@ -249,16 +249,6 @@ rotate_3f(enum Rotation rot, float &x, float &y, float &z)
return; return;
} }
case ROTATION_YAW_293_PITCH_68_ROLL_90: {
const float tmpx = x;
const float tmpy = y;
const float tmpz = z;
x = -0.390731f * tmpy - 0.920505f * tmpz;
y = 0.374607f * tmpx - 0.853477f * tmpy + 0.362280f * tmpz;
z = -0.927184f * tmpx - 0.344827f * tmpy + 0.146371f * tmpz;
return;
}
case ROTATION_PITCH_9_YAW_180: { case ROTATION_PITCH_9_YAW_180: {
const float tmpx = x; const float tmpx = x;
const float tmpy = y; const float tmpy = y;

6
src/lib/conversion/rotation.h
View File

@ -93,9 +93,8 @@ enum Rotation {
ROTATION_ROLL_270_YAW_180 = 41, ROTATION_ROLL_270_YAW_180 = 41,
ROTATION_ROLL_270_YAW_270 = 42, ROTATION_ROLL_270_YAW_270 = 42,
ROTATION_PITCH_90_YAW_180 = 43, ROTATION_PITCH_90_YAW_180 = 43,
ROTATION_YAW_293_PITCH_68_ROLL_90 = 44, ROTATION_PITCH_9_YAW_180 = 44,
ROTATION_PITCH_9_YAW_180 = 45, ROTATION_PITCH_45 = 45,
ROTATION_PITCH_45 = 46,
ROTATION_MAX ROTATION_MAX
}; };
@ -150,7 +149,6 @@ const rot_lookup_t rot_lookup[] = {
{270, 0, 180 }, {270, 0, 180 },
{270, 0, 270 }, {270, 0, 270 },
{ 0, 90, 180 }, { 0, 90, 180 },
{293, 68, 90 },
{ 0, 9, 180 }, { 0, 9, 180 },
{ 0, 45, 0 }, { 0, 45, 0 },
}; };