Rev 2344 | Rev 2349 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2344 | Rev 2345 | ||
|---|---|---|---|
| Line 791... | Line 791... | ||
| 791 | // Emfang gut |
791 | // Emfang gut |
| 792 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
792 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 793 | if(SenderOkay > 140) |
793 | if(SenderOkay > 140) |
| 794 | { |
794 | { |
| 795 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
795 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| 796 | static unsigned int trigger = 0; |
796 | static unsigned int trigger = 1000; |
| 797 | static unsigned char old_switch = 100; |
797 | static unsigned char old_switch = 100; |
| 798 | if(EE_Parameter.StartLandChannel && EE_Parameter.LandingSpeed) |
798 | if(EE_Parameter.StartLandChannel && EE_Parameter.LandingSpeed) |
| 799 | { |
799 | { |
| 800 | if(PPM_in[EE_Parameter.StartLandChannel] > 50) |
800 | if(PPM_in[EE_Parameter.StartLandChannel] > 50) |
| 801 | { |
801 | { |
| Line 883... | Line 883... | ||
| 883 | trigger++; |
883 | trigger++; |
| 884 | SummeNick = 0; |
884 | SummeNick = 0; |
| 885 | SummeRoll = 0; |
885 | SummeRoll = 0; |
| 886 | Mess_Integral_Gier = 0; |
886 | Mess_Integral_Gier = 0; |
| 887 | SollHoehe = HoehenWertF - 300; |
887 | SollHoehe = HoehenWertF - 300; |
| - | 888 | if(trigger == 1000 && FC_StatusFlags2 & FC_STATUS2_AUTO_LANDING && VarioCharacter != '+') |
|
| - | 889 | { |
|
| - | 890 | FC_StatusFlags2 &= ~FC_STATUS2_AUTO_LANDING; |
|
| - | 891 | FC_StatusFlags2 |= FC_STATUS2_WAIT_FOR_TAKEOFF; // go back into starting state |
|
| - | 892 | } |
|
| 888 | } |
893 | } |
| 889 | else |
894 | else |
| 890 | if(ACC_AltitudeControl && (VarioCharacter == 'v' || VarioCharacter == '-') && HoehenWert < 1000 /*&& FromNC_AltitudeSetpoint < 0*/) |
895 | if(ACC_AltitudeControl && (VarioCharacter == 'v' || VarioCharacter == '-') && HoehenWert < 1000 /*&& FromNC_AltitudeSetpoint < 0*/) |
| 891 | { |
896 | { |
| - | 897 | if(Aktuell_az > 940) |
|
| - | 898 | { |
|
| - | 899 | trigger = 0; |
|
| 892 | if(Aktuell_az > 940) { trigger = 0; SpeakHoTT = SPEAK_LANDING; }; |
900 | SpeakHoTT = SPEAK_LANDING; |
| - | 901 | }; |
|
| 893 | } |
902 | } |
| 894 | #endif |
903 | #endif |
| 895 | } |
904 | } |
| 896 | } // end of: modell_fliegt > 256 |
905 | } // end of: modell_fliegt > 256 |
| 897 | if((PPM_in[EE_Parameter.Kanalbelegung[K_GAS]] > 80) && MotorenEin == 0) |
906 | if((PPM_in[EE_Parameter.Kanalbelegung[K_GAS]] > 80) && MotorenEin == 0) |
| Line 937... | Line 946... | ||
| 937 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
946 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| 938 | if(VersionInfo.HardwareError[0]) SpeakHoTT = SPEAK_ERR_SENSOR; |
947 | if(VersionInfo.HardwareError[0]) SpeakHoTT = SPEAK_ERR_SENSOR; |
| 939 | else |
948 | else |
| 940 | if(!CalibrationDone) SpeakHoTT = SPEAK_ERR_CALIBARTION; |
949 | if(!CalibrationDone) SpeakHoTT = SPEAK_ERR_CALIBARTION; |
| 941 | else SpeakHoTT = SPEAK_CALIBRATE; |
950 | else SpeakHoTT = SPEAK_CALIBRATE; |
| 942 | ShowSettingName = 20; // for HoTT & Jeti (muss eine gerade Zahl sein) |
951 | ShowSettingNameTime = 5; // for HoTT & Jeti |
| 943 | #endif |
952 | #endif |
| 944 | Piep(ActiveParamSet,120); |
953 | Piep(ActiveParamSet,120); |
| 945 | } |
954 | } |
| 946 | } |
955 | } |
| 947 | } |
956 | } |