| 56,10 → 56,6 |
|---|
| #include "controlMixer.h" |
| #include "configuration.h" |
| |
| // for DebugOut only. |
| #include "uart0.h" |
| |
| |
| // The channel array is 1-based. The 0th entry is not used. |
| volatile int16_t PPM_in[MAX_CHANNELS]; |
| volatile int16_t PPM_diff[MAX_CHANNELS]; |
| 122,7 → 118,6 |
|---|
| SREG = sreg; |
| } |
| |
| |
| /********************************************************************/ |
| /* Every time a positive edge is detected at PD6 */ |
| /********************************************************************/ |
| 216,8 → 211,8 |
|---|
| if(RC_Quality) { |
| RC_Quality--; |
| if (NewPpmData-- == 0) { |
| RC_PRTY[CONTROL_PITCH] = (RCChannel(CH_PITCH) - stickOffsetPitch) * staticParams.StickP + RCDiff(CH_PITCH) * staticParams.StickD; |
| RC_PRTY[CONTROL_ROLL] = (RCChannel(CH_ROLL) - stickOffsetRoll) * staticParams.StickP + RCDiff(CH_ROLL) * staticParams.StickD; |
| RC_PRTY[CONTROL_PITCH] = RCChannel(CH_PITCH) * staticParams.StickP - stickOffsetPitch + RCDiff(CH_PITCH) * staticParams.StickD; |
| RC_PRTY[CONTROL_ROLL] = RCChannel(CH_ROLL) * staticParams.StickP - stickOffsetRoll + RCDiff(CH_ROLL) * staticParams.StickD; |
| RC_PRTY[CONTROL_THROTTLE] = RCChannel(CH_THROTTLE) + PPM_diff[staticParams.ChannelAssignment[CH_THROTTLE]] * dynamicParams.UserParams[3] + 120; |
| if (RC_PRTY[CONTROL_THROTTLE] < 0) RC_PRTY[CONTROL_THROTTLE] = 0; // Throttle is non negative. |
| tmp1 = -RCChannel(CH_YAW) - RCDiff(CH_YAW); |
| 280,8 → 275,8 |
|---|
| // In HH, it s OK to trim the R/C. The effect should not be conteracted here. |
| stickOffsetPitch = stickOffsetRoll = 0; |
| } else { |
| stickOffsetPitch = RCChannel(CH_PITCH); |
| stickOffsetRoll = RCChannel(CH_ROLL); |
| stickOffsetPitch = RCChannel(CH_PITCH) * staticParams.StickP; |
| stickOffsetRoll = RCChannel(CH_ROLL) * staticParams.StickP; |
| } |
| } |
| |