Rev 1931 | Rev 1933 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1931 | Rev 1932 | ||
|---|---|---|---|
| Line 1496... | Line 1496... | ||
| 1496 | } |
1496 | } |
| 1497 | } |
1497 | } |
| 1498 | else |
1498 | else |
| 1499 | if(FC_StatusFlags & (FC_STATUS_VARIO_TRIM_UP|FC_STATUS_VARIO_TRIM_DOWN)) |
1499 | if(FC_StatusFlags & (FC_STATUS_VARIO_TRIM_UP|FC_STATUS_VARIO_TRIM_DOWN)) |
| 1500 | { |
1500 | { |
| 1501 | //if(!WaypointTrimming) SollHoehe = HoehenWert; // update setpoint to current height |
- | |
| 1502 | //else |
- | |
| 1503 | if(!WaypointTrimming) LIMIT_MIN_MAX(SollHoehe, (HoehenWert-128), (HoehenWert+128)) // max. 1m Unterschied |
1501 | if(!WaypointTrimming) LIMIT_MIN_MAX(SollHoehe, (HoehenWert-128), (HoehenWert+128)) // max. 1m Unterschied |
| 1504 | else WaypointTrimming = 0; |
1502 | else WaypointTrimming = 0; |
| 1505 | FC_StatusFlags &= ~(FC_STATUS_VARIO_TRIM_UP|FC_STATUS_VARIO_TRIM_DOWN); |
1503 | FC_StatusFlags &= ~(FC_STATUS_VARIO_TRIM_UP|FC_STATUS_VARIO_TRIM_DOWN); |
| 1506 | HeightTrimming = 0; |
1504 | HeightTrimming = 0; |
| 1507 | if(Parameter_ExtraConfig & CFG2_VARIO_BEEP) beeptime = 500; |
1505 | if(Parameter_ExtraConfig & CFG2_VARIO_BEEP) beeptime = 500; |
| Line 1520... | Line 1518... | ||
| 1520 | else SollHoehe += WaypointTrimming; |
1518 | else SollHoehe += WaypointTrimming; |
| 1521 | } |
1519 | } |
| 1522 | else |
1520 | else |
| 1523 | SollHoehe += (HeightTrimming * EE_Parameter.Hoehe_Verstaerkung)/(5 * 512 / 2); // move setpoint |
1521 | SollHoehe += (HeightTrimming * EE_Parameter.Hoehe_Verstaerkung)/(5 * 512 / 2); // move setpoint |
| 1524 | HeightTrimming = 0; |
1522 | HeightTrimming = 0; |
| 1525 | LIMIT_MIN_MAX(SollHoehe, (HoehenWert-512), (HoehenWert+512)); // max. 5m Unterschied |
1523 | LIMIT_MIN_MAX(SollHoehe, (HoehenWert-1024), (HoehenWert+1024)); // max. 10m Unterschied |
| 1526 | if(Parameter_ExtraConfig & CFG2_VARIO_BEEP) beeptime = 100; |
1524 | if(Parameter_ExtraConfig & CFG2_VARIO_BEEP) beeptime = 100; |
| 1527 | //update hoover gas stick value when setpoint is shifted |
1525 | //update hoover gas stick value when setpoint is shifted |
| 1528 | if(!EE_Parameter.Hoehe_StickNeutralPoint && FromNC_AltitudeSpeed == 0) |
1526 | if(!EE_Parameter.Hoehe_StickNeutralPoint && FromNC_AltitudeSpeed == 0) |
| 1529 | { |
1527 | { |
| 1530 | StickGasHover = HoverGas/STICK_GAIN; //rescale back to stick value |
1528 | StickGasHover = HoverGas/STICK_GAIN; //rescale back to stick value |