Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2720 → Rev 2721

/trunk/fc.c
868,7 → 868,7
if(ExternalControl.Switches & EC2_CAREFREE) Parameter_CareFree_Switch = 250;
else Parameter_CareFree_Switch = 0;
if(ExternalControl.Switches & EC2_ALTITUDE) Parameter_HoehenSchalter = 250;
if(ExternalControl.Switches & EC2_ALTITUDE) { Parameter_HoehenSchalter = 250; Parameter_GlobalConfig |= (CFG_HOEHENREGELUNG | CFG_HOEHEN_SCHALTER);}
else Parameter_HoehenSchalter = 0;
}
}
934,6 → 934,14
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
if(ExternalControl.Config & EC_VALID)
{
if(MotorenEin && (ExternalControl.Config & EC_ONLY_IF_MOTOR_OFF)) // this is used for calibrate etc.
{
ExternalControl.Nick = 0;
ExternalControl.Roll = 0;
ExternalControl.Gier = 0;
ExternalControl.Gas = 0;
}
if(ExternalControl.Config & EC_IGNORE_RC_STICK) // do not add
{
ChannelNick = ExternalControl.Nick;
1080,7 → 1088,7
FromNC_AltitudeSetpoint = 500;
SollHoehe = 500;
trigger = 1000;
if(NC_To_FC_Flags & NC_TO_FC_AUTOSTART) SpeakHoTT = SPEAK_NEXT_WP;
if(NC_To_FC_Flags & NC_TO_FC_AUTOSTART) SpeakHoTT = SPEAK_STARTING_WP;
/* if(StartTrigger != 2)
{
StartTrigger = 1;
1184,8 → 1192,8
if(VersionInfo.HardwareError[0]) SpeakHoTT = SPEAK_ERR_SENSOR;
else
if(!CalibrationDone) SpeakHoTT = SPEAK_ERR_CALIBARTION;
else SpeakHoTT = SPEAK_CALIBRATE;
ShowSettingNameTime = 5; // for HoTT & Jeti
else { SpeakHoTT = SPEAK_CALIBRATE; TimerSpeakReady = 6;}
ShowSettingNameTime = 4; // for HoTT & Jeti
#endif
Piep(ActiveParamSet,120);
}
1204,7 → 1212,7
if(VersionInfo.HardwareError[0]) SpeakHoTT = SPEAK_ERR_SENSOR;
else
if(!CalibrationDone) SpeakHoTT = SPEAK_ERR_CALIBARTION;
else SpeakHoTT = SPEAK_CALIBRATE;
else { SpeakHoTT = SPEAK_CALIBRATE; TimerSpeakReady = 6;}
ShowSettingNameTime = 5; // for HoTT & Jeti
#endif
Piep(ActiveParamSet,120);
1271,6 → 1279,7
beeptime = 1500; // indicate missing calibration
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
if(!CalibrationDone) SpeakHoTT = SPEAK_ERR_CALIBARTION;
else SpeakHoTT = SPEAK_ERROR;
#endif
}
}
1476,7 → 1485,7
StickGas = StickGasHover;
StickGier = 0;
Parameter_GlobalConfig &= ~(CFG_HEADING_HOLD | CFG_DREHRATEN_BEGRENZER);
Parameter_GlobalConfig |= CFG_HOEHENREGELUNG | CFG_KOMPASS_AKTIV | CFG_GPS_AKTIV | CFG_HOEHEN_SCHALTER | CFG_GPS_AKTIV;
Parameter_GlobalConfig |= CFG_HOEHENREGELUNG | CFG_KOMPASS_AKTIV | CFG_GPS_AKTIV | CFG_HOEHEN_SCHALTER;
Parameter_ExtraConfig &= ~(CFG2_HEIGHT_LIMIT | CFG_LEARNABLE_CAREFREE | CFG2_VARIO_BEEP);
Parameter_HoehenSchalter = 200; // switch on
}