Rev 1672 | Rev 1676 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1672 | Rev 1675 | ||
|---|---|---|---|
| Line 1585... | Line 1585... | ||
| 1585 | if(GasMischanteil > (MAX_GAS - 20) * STICK_GAIN) GasMischanteil = (MAX_GAS - 20) * STICK_GAIN; |
1585 | if(GasMischanteil > (MAX_GAS - 20) * STICK_GAIN) GasMischanteil = (MAX_GAS - 20) * STICK_GAIN; |
| Line 1586... | Line 1586... | ||
| 1586 | 1586 | ||
| 1587 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
1587 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 1588 | // all BL-Ctrl connected? |
1588 | // all BL-Ctrl connected? |
| 1589 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
1589 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 1590 | if(MissingMotor) |
1590 | if(MissingMotor || Capacity.MinOfMaxPWM != 255) |
| 1591 | if(modell_fliegt > 1 && modell_fliegt < 50 && GasMischanteil > 0) |
1591 | if(modell_fliegt > 1 && modell_fliegt < 50 && GasMischanteil > 0) |
| 1592 | { |
1592 | { |
| 1593 | modell_fliegt = 1; |
1593 | modell_fliegt = 1; |
| 1594 | GasMischanteil = MIN_GAS; |
1594 | GasMischanteil = (MIN_GAS + 10) * STICK_GAIN; |
| 1595 | } |
1595 | } |
| 1596 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
1596 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 1597 | // + Mischer und PI-Regler |
1597 | // + Mischer und PI-Regler |
| 1598 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
1598 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| Line 1663... | Line 1663... | ||
| 1663 | else tmp_int += ((long)pd_ergebnis_roll * Mixer.Motor[i][2]) / 64L; |
1663 | else tmp_int += ((long)pd_ergebnis_roll * Mixer.Motor[i][2]) / 64L; |
| 1664 | // Gier |
1664 | // Gier |
| 1665 | if(Mixer.Motor[i][3] == 64) tmp_int += GierMischanteil * 2; |
1665 | if(Mixer.Motor[i][3] == 64) tmp_int += GierMischanteil * 2; |
| 1666 | else if(Mixer.Motor[i][3] == -64) tmp_int -= GierMischanteil * 2; |
1666 | else if(Mixer.Motor[i][3] == -64) tmp_int -= GierMischanteil * 2; |
| 1667 | else tmp_int += ((long)GierMischanteil * Mixer.Motor[i][3]) / 32L; |
1667 | else tmp_int += ((long)GierMischanteil * Mixer.Motor[i][3]) / 32L; |
| - | 1668 | ||
| - | 1669 | if(Parameter_UserParam5 > 50) |
|
| - | 1670 | { |
|
| - | 1671 | if(tmp_int > tmp_motorwert[i]) tmp_int = (tmp_motorwert[i] + tmp_int) / 2; // MotorSmoothing |
|
| - | 1672 | else tmp_int = 2 * tmp_int - tmp_motorwert[i]; // MotorSmoothing |
|
| - | 1673 | } |
|
| - | 1674 | ||
| 1668 | /* |
1675 | /* |
| 1669 | if(tmp_int > tmp_motorwert[i]) tmp_int = (tmp_motorwert[i] + tmp_int) / 2; // MotorSmoothing |
1676 | if(tmp_int > tmp_motorwert[i]) tmp_int = (tmp_motorwert[i] + tmp_int) / 2; // MotorSmoothing |
| 1670 | else tmp_int = 2 * tmp_int - tmp_motorwert[i]; // MotorSmoothing |
1677 | else tmp_int = 2 * tmp_int - tmp_motorwert[i]; // MotorSmoothing |
| 1671 | - | ||
| 1672 | if(Poti2 > 50) |
1678 | if(Poti2 > 50) |
| 1673 | { |
1679 | { |
| 1674 | if(tmp_int > tmp_motorwert[i]) tmp_int = (tmp_motorwert[i] + tmp_int) / 2; // MotorSmoothing |
1680 | if(tmp_int > tmp_motorwert[i]) tmp_int = (tmp_motorwert[i] + tmp_int) / 2; // MotorSmoothing |
| 1675 | else if(Poti2 > 150) tmp_int = 2 * tmp_int - tmp_motorwert[i]; // MotorSmoothing |
1681 | else if(Poti2 > 150) tmp_int = 2 * tmp_int - tmp_motorwert[i]; // MotorSmoothing |
| 1676 | } |
1682 | } |