| /trunk/fc.c |
|---|
| 793,7 → 793,7 |
| if(SenderOkay > 140) |
| { |
| #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| static unsigned int trigger = 0; |
| static unsigned int trigger = 1000; |
| static unsigned char old_switch = 100; |
| if(EE_Parameter.StartLandChannel && EE_Parameter.LandingSpeed) |
| { |
| 885,11 → 885,20 |
| SummeRoll = 0; |
| Mess_Integral_Gier = 0; |
| SollHoehe = HoehenWertF - 300; |
| if(trigger == 1000 && FC_StatusFlags2 & FC_STATUS2_AUTO_LANDING && VarioCharacter != '+') |
| { |
| FC_StatusFlags2 &= ~FC_STATUS2_AUTO_LANDING; |
| FC_StatusFlags2 |= FC_STATUS2_WAIT_FOR_TAKEOFF; // go back into starting state |
| } |
| } |
| else |
| if(ACC_AltitudeControl && (VarioCharacter == 'v' || VarioCharacter == '-') && HoehenWert < 1000 /*&& FromNC_AltitudeSetpoint < 0*/) |
| { |
| if(Aktuell_az > 940) { trigger = 0; SpeakHoTT = SPEAK_LANDING; }; |
| if(Aktuell_az > 940) |
| { |
| trigger = 0; |
| SpeakHoTT = SPEAK_LANDING; |
| }; |
| } |
| #endif |
| } |
| 939,7 → 948,7 |
| else |
| if(!CalibrationDone) SpeakHoTT = SPEAK_ERR_CALIBARTION; |
| else SpeakHoTT = SPEAK_CALIBRATE; |
| ShowSettingName = 20; // for HoTT & Jeti (muss eine gerade Zahl sein) |
| ShowSettingNameTime = 5; // for HoTT & Jeti |
| #endif |
| Piep(ActiveParamSet,120); |
| } |
| /trunk/hottmenu.c |
|---|
| 89,7 → 89,7 |
| ElectricAirPacket_t ElectricAirPacket; |
| HoTTGeneral_t HoTTGeneral; |
| unsigned char SpeakHoTT = SPEAK_MIKROKOPTER; |
| unsigned char ToNC_SpeakHoTT = 0, ShowSettingName = 0; |
| unsigned char ToNC_SpeakHoTT = 0, ShowSettingNameTime = 0; |
| int HoTTVarioMeter = 0; |
| const char PROGMEM MIKROKOPTER[] = {" MikroKopter "}; |
| const char PROGMEM UNDERVOLTAGE[] = {" !! LiPo voltage !! "}; |
| 365,9 → 365,8 |
| VarioPacket.Text[19] = ' '; |
| } |
| else |
| if(ShowSettingName) // no Error |
| if(ShowSettingNameTime) // no Error |
| { |
| ShowSettingName -= 2; |
| for(i=0; i<sizeof(SETTING);i++) VarioPacket.Text[i] = pgm_read_byte(&SETTING[i]); |
| VarioPacket.Text[4] = '0' + ActiveParamSet; |
| for(i=0; i<sizeof(EE_Parameter.Name);i++) VarioPacket.Text[i+7] = EE_Parameter.Name[i]; // no Error |
| /trunk/hottmenu.h |
|---|
| 48,7 → 48,7 |
| extern unsigned char HottKeyboard,HoTT_RequestedSensor; |
| extern unsigned char HottUpdate(unsigned char key); |
| extern unsigned char SpeakHoTT,ShowSettingName; |
| extern unsigned char SpeakHoTT,ShowSettingNameTime; |
| extern unsigned char ToNC_SpeakHoTT; |
| extern volatile unsigned char *HoTT_DataPointer; |
| extern unsigned char MaxBlTempertaure; |
| /trunk/jetimenu.c |
|---|
| 103,9 → 103,8 |
| } |
| } |
| else |
| if(ShowSettingName) |
| if(ShowSettingNameTime) |
| { |
| ShowSettingName--; |
| LIBFC_JetiBox_Clear(); |
| JetiBox_printfxy(0,1,"Set%d:%s ",ActiveParamSet,EE_Parameter.Name); |
| return; // nichts weiter ausgeben |
| /trunk/libfc1284.a |
|---|
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| /trunk/main.c |
|---|
| 424,6 → 424,7 |
| if(++second == 49) |
| { |
| second = 0; |
| if(ShowSettingNameTime) ShowSettingNameTime--; |
| if(FC_StatusFlags & FC_STATUS_FLY) FlugSekunden++; |
| else timer2 = 1450; // 0,5 Minuten aufrunden |
| if(modell_fliegt < 1024) |