Rev 1719 | Rev 1722 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1719 | Rev 1720 | ||
|---|---|---|---|
| Line 1437... | Line 1437... | ||
| 1437 | if(abs(HeightTrimming) > 512) |
1437 | if(abs(HeightTrimming) > 512) |
| 1438 | { |
1438 | { |
| 1439 | SollHoehe += (HeightTrimming * EE_Parameter.Hoehe_Verstaerkung)/(5 * 512 / 2); // move setpoint |
1439 | SollHoehe += (HeightTrimming * EE_Parameter.Hoehe_Verstaerkung)/(5 * 512 / 2); // move setpoint |
| 1440 | HeightTrimming = 0; |
1440 | HeightTrimming = 0; |
| 1441 | LIMIT_MIN_MAX(SollHoehe, (HoehenWert-1024), (HoehenWert+1024)); // max. 10m Unterschied |
1441 | LIMIT_MIN_MAX(SollHoehe, (HoehenWert-1024), (HoehenWert+1024)); // max. 10m Unterschied |
| 1442 | if(EE_Parameter.ExtraConfig & CFG2_VARIO_BEEP) beeptime = 75; |
1442 | if(EE_Parameter.ExtraConfig & CFG2_VARIO_BEEP) beeptime = 100; |
| 1443 | //update hoover gas stick value when setpoint is shifted |
1443 | //update hoover gas stick value when setpoint is shifted |
| 1444 | if(!EE_Parameter.Hoehe_StickNeutralPoint) |
1444 | if(!EE_Parameter.Hoehe_StickNeutralPoint) |
| 1445 | { |
1445 | { |
| 1446 | StickGasHover = HoverGas/STICK_GAIN; //rescale back to stick value |
1446 | StickGasHover = HoverGas/STICK_GAIN; //rescale back to stick value |
| 1447 | StickGasHover = (StickGasHover * UBat) / BattLowVoltageWarning; |
1447 | StickGasHover = (StickGasHover * UBat) / BattLowVoltageWarning; |
| Line 1481... | Line 1481... | ||
| 1481 | tmp_int = VarioMeter / 8; |
1481 | tmp_int = VarioMeter / 8; |
| 1482 | LIMIT_MIN_MAX(tmp_int, -127, 128); |
1482 | LIMIT_MIN_MAX(tmp_int, -127, 128); |
| 1483 | tmp_int = (tmp_int * (long)Parameter_Luftdruck_D) / 4L; // scale to d-gain parameter |
1483 | tmp_int = (tmp_int * (long)Parameter_Luftdruck_D) / 4L; // scale to d-gain parameter |
| 1484 | LIMIT_MIN_MAX(tmp_int,-64 * STICK_GAIN, 64 * STICK_GAIN); |
1484 | LIMIT_MIN_MAX(tmp_int,-64 * STICK_GAIN, 64 * STICK_GAIN); |
| 1485 | if(HeightTrimmingFlag) tmp_int /= 4; // reduce d-part while trimming setpoint |
1485 | if(HeightTrimmingFlag) tmp_int /= 4; // reduce d-part while trimming setpoint |
| - | 1486 | else |
|
| - | 1487 | if(EE_Parameter.ExtraConfig & CFG2_HEIGHT_LIMIT) tmp_int /= 16; // reduce d-part in "Deckel" mode |
|
| 1486 | GasReduction += tmp_int; |
1488 | GasReduction += tmp_int; |
| 1487 | } // EOF no baro range expanding |
1489 | } // EOF no baro range expanding |
| 1488 | // ------------------------ D-Part 2: ACC-Z Integral ------------------------ |
1490 | // ------------------------ D-Part 2: ACC-Z Integral ------------------------ |
| 1489 | if(Parameter_Hoehe_ACC_Wirkung) |
1491 | if(Parameter_Hoehe_ACC_Wirkung) |
| 1490 | { |
1492 | { |