Rev 2047 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2047 | Rev 2048 | ||
|---|---|---|---|
| 1 | #include <inttypes.h> |
1 | #include <inttypes.h> |
| 2 | #include "attitude.h" |
2 | #include "attitude.h" |
| 3 | #include "uart0.h" |
3 | #include "uart0.h" |
| 4 | #include "configuration.h" |
4 | #include "configuration.h" |
| 5 | #include "dongfangMath.h" |
5 | #include "dongfangMath.h" |
| - | 6 | #include "controlMixer.h" |
|
| 6 | 7 | ||
| 7 | // For scope debugging only! |
8 | // For scope debugging only! |
| 8 | #include "output.h" |
9 | #include "output.h" |
| 9 | 10 | ||
| 10 | // = cos^2(45 degs). |
11 | // = cos^2(45 degs). |
| 11 | // const int32_t FACTORSQUARED = 1L << (MATH_UNIT_FACTOR_LOG * 2); |
12 | // const int32_t FACTORSQUARED = 1L << (MATH_UNIT_FACTOR_LOG * 2); |
| 12 | const int32_t MINPROJECTION = 1L << (LOG_MATH_UNIT_FACTOR * 2 - 9); |
13 | const int32_t MINPROJECTION = 1L << (LOG_MATH_UNIT_FACTOR * 2 - 9); |
| 13 | 14 | ||
| 14 | // Takes 380 - 400 usec. Way too slow. |
15 | // Takes 380 - 400 usec. Way too slow. |
| 15 | // With static MINPROJECTION: 220 usec. |
16 | // With static MINPROJECTION: 220 usec. |
| 16 | uint16_t AC_getThrottle(uint16_t throttle) { |
17 | void AC_getPRTY(int16_t* PRTY) { |
| - | 18 | int16_t throttle = PRTY[CONTROL_THROTTLE]; |
|
| 17 | int32_t projection; |
19 | int32_t projection; |
| 18 | uint8_t effect = dynamicParams.attitudeControl; // Userparam 3 |
20 | uint8_t effect = dynamicParams.attitudeControl; // Userparam 3 |
| 19 | int16_t deltaThrottle, y; |
21 | int16_t deltaThrottle, y; |
| 20 | 22 | ||
| 21 | int16_t rollAngleInDegrees = angle[ROLL] / GYRO_DEG_FACTOR_PITCHROLL; |
23 | int16_t rollAngleInDegrees = attitude[ROLL]/GYRO_DEG_FACTOR_PITCHROLL; |
| 22 | int16_t pitchAngleInDegrees = angle[PITCH] / GYRO_DEG_FACTOR_PITCHROLL; |
24 | int16_t pitchAngleInDegrees = attitude[PITCH]/GYRO_DEG_FACTOR_PITCHROLL; |
| 23 | 25 | ||
| 24 | projection = (int32_t) cos_360(pitchAngleInDegrees) * (int32_t) cos_360(rollAngleInDegrees); |
26 | projection = (int32_t) cos_360(pitchAngleInDegrees) * (int32_t) cos_360(rollAngleInDegrees); |
| 25 | projection >>= 8; |
27 | projection >>= 8; |
| 26 | 28 | ||
| 27 | if (projection < 0) { |
29 | if (projection < 0) { |
| 28 | // Case not yet considered! |
30 | // Case not yet considered! |
| 29 | y = 0; |
31 | y = 0; |
| 30 | } else { |
32 | } else { |
| 31 | if (projection < MINPROJECTION && projection >= 0) { |
33 | if (projection < MINPROJECTION && projection >= 0) { |
| 32 | projection = MINPROJECTION; |
34 | projection = MINPROJECTION; |
| 33 | } else if (projection > -MINPROJECTION && projection < 0) { |
35 | } else if (projection > -MINPROJECTION && projection < 0) { |
| 34 | projection = -MINPROJECTION; |
36 | projection = -MINPROJECTION; |
| 35 | } else { |
37 | } else { |
| 36 | } |
38 | } |
| 37 | y = ((int32_t) throttle << (LOG_MATH_UNIT_FACTOR * 2 - 8)) / projection - throttle; |
39 | y = ((int32_t) throttle << (LOG_MATH_UNIT_FACTOR * 2 - 8)) / projection - throttle; |
| 38 | } |
40 | } |
| 39 | deltaThrottle = ((int32_t)y * effect) >> 6; |
41 | deltaThrottle = ((int32_t)y * effect) >> 6; |
| 40 | // debugOut.analog[8] = deltaThrottle; |
42 | // debugOut.analog[8] = deltaThrottle; |
| 41 | return throttle + deltaThrottle; |
43 | PRTY[CONTROL_THROTTLE] = throttle; |
| 42 | } |
44 | } |
| 43 | 45 | ||