| 1385,10 → 1385,6 |
|---|
| VarioCharacter = ' '; |
| if(HoehenReglerAktiv && !(FC_StatusFlags & FC_STATUS_EMERGENCY_LANDING)) |
| { |
| #define HEIGHT_TRIM_UP 0x01 |
| #define HEIGHT_TRIM_DOWN 0x02 |
| static unsigned char HeightTrimmingFlag = 0x00; |
| |
| #define HEIGHT_CONTROL_STICKTHRESHOLD 15 |
| // Holger original version |
| // start of height control algorithm |
| 1399,6 → 1395,7 |
|---|
| { // old version |
| HCGas = GasMischanteil; // take current stick gas as neutral point for the height control |
| HeightTrimming = 0; |
| FC_StatusFlags &= ~(FC_STATUS_VARIO_TRIM_UP|FC_STATUS_VARIO_TRIM_DOWN); |
| } |
| else |
| { |
| 1410,31 → 1407,31 |
|---|
| { // gas stick is above hoover point |
| if(StickGas > (StickGasHover + HEIGHT_CONTROL_STICKTHRESHOLD) && !BaroAtUpperLimit) |
| { |
| if(HeightTrimmingFlag & HEIGHT_TRIM_DOWN) |
| if(FC_StatusFlags & FC_STATUS_VARIO_TRIM_DOWN) |
| { |
| HeightTrimmingFlag &= ~HEIGHT_TRIM_DOWN; |
| FC_StatusFlags &= ~FC_STATUS_VARIO_TRIM_DOWN; |
| SollHoehe = HoehenWert; // update setpoint to current heigth |
| } |
| HeightTrimmingFlag |= HEIGHT_TRIM_UP; |
| FC_StatusFlags |= FC_STATUS_VARIO_TRIM_UP; |
| HeightTrimming += abs(StickGas - (StickGasHover + HEIGHT_CONTROL_STICKTHRESHOLD)); |
| VarioCharacter = '+'; |
| } // gas stick is below hoover point |
| else if(StickGas < (StickGasHover - HEIGHT_CONTROL_STICKTHRESHOLD) && !BaroAtLowerLimit ) |
| { |
| if(HeightTrimmingFlag & HEIGHT_TRIM_UP) |
| if(FC_StatusFlags & FC_STATUS_VARIO_TRIM_UP) |
| { |
| HeightTrimmingFlag &= ~HEIGHT_TRIM_UP; |
| FC_StatusFlags &= ~FC_STATUS_VARIO_TRIM_UP; |
| SollHoehe = HoehenWert; // update setpoint to current heigth |
| } |
| HeightTrimmingFlag |= HEIGHT_TRIM_DOWN; |
| FC_StatusFlags |= FC_STATUS_VARIO_TRIM_DOWN; |
| HeightTrimming -= abs(StickGas - (StickGasHover - HEIGHT_CONTROL_STICKTHRESHOLD)); |
| VarioCharacter = '-'; |
| } |
| else // Gas Stick in Hover Range |
| { |
| if(HeightTrimmingFlag & (HEIGHT_TRIM_UP | HEIGHT_TRIM_DOWN)) |
| if(FC_StatusFlags & (FC_STATUS_VARIO_TRIM_UP|FC_STATUS_VARIO_TRIM_DOWN)) |
| { |
| HeightTrimmingFlag &= ~(HEIGHT_TRIM_UP | HEIGHT_TRIM_DOWN); |
| FC_StatusFlags &= ~(FC_STATUS_VARIO_TRIM_UP|FC_STATUS_VARIO_TRIM_DOWN); |
| HeightTrimming = 0; |
| SollHoehe = HoehenWert; // update setpoint to current height |
| if(EE_Parameter.ExtraConfig & CFG2_VARIO_BEEP) beeptime = 500; |
| 1494,7 → 1491,7 |
|---|
| LIMIT_MIN_MAX(tmp_int, -127, 128); |
| tmp_int = (tmp_int * (long)Parameter_Luftdruck_D) / 4L; // scale to d-gain parameter |
| LIMIT_MIN_MAX(tmp_int,-64 * STICK_GAIN, 64 * STICK_GAIN); |
| if(HeightTrimmingFlag) tmp_int /= 4; // reduce d-part while trimming setpoint |
| if(FC_StatusFlags & (FC_STATUS_VARIO_TRIM_UP|FC_STATUS_VARIO_TRIM_DOWN)) tmp_int /= 4; // reduce d-part while trimming setpoint |
| else |
| if(EE_Parameter.ExtraConfig & CFG2_HEIGHT_LIMIT) tmp_int /= 8; // reduce d-part in "Deckel" mode |
| GasReduction += tmp_int; |