Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2694 → Rev 2695

/trunk/fc.c
604,7 → 604,7
Mess_Integral_Gier += MesswertGier;
ErsatzKompass += MesswertGier;
// Kopplungsanteil +++++++++++++++++++++++++++++++++++++
if(!Looping_Nick && !Looping_Roll)// && (Parameter_GlobalConfig & CFG_ACHSENKOPPLUNG_AKTIV))
if(!Looping_Nick && !Looping_Roll)
{
tmpl3 = (MesswertRoll * winkel_nick) / 2048L;
tmpl3 *= Parameter_AchsKopplung2; //65
1476,7 → 1476,7
StickGas = StickGasHover;
StickGier = 0;
Parameter_GlobalConfig &= ~(CFG_HEADING_HOLD | CFG_DREHRATEN_BEGRENZER);
Parameter_GlobalConfig |= CFG_HOEHENREGELUNG | CFG_ACHSENKOPPLUNG_AKTIV | 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 | CFG_GPS_AKTIV;
Parameter_ExtraConfig &= ~(CFG2_HEIGHT_LIMIT | CFG_LEARNABLE_CAREFREE | CFG2_VARIO_BEEP);
Parameter_HoehenSchalter = 200; // switch on
}
2235,8 → 2235,6
{
if(GasMischanteil/STICK_GAIN > HooverGasEmergencyPercent && HoverGas) GasMischanteil = HooverGasEmergencyPercent * STICK_GAIN;
SollHoehe = HoehenWertF; // update setpoint to current heigth
beeptime = 15000;
BeepMuster = 0x0E00;
}
// limit gas to parameter setting
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
/trunk/fc.h
47,6 → 47,7
#define NC_TO_FC_FAILSAFE_LANDING 0x08 // moves Servos into FS-Position
#define NC_TO_FC_SIMULATION_ACTIVE 0x10 // don't start motors
#define NC_TO_FC_SWITCHOFF_IF_LANDED 0x20 // switch off if MK is on the ground and doesn't further sink
#define NC_TO_FC_OUTSIDE_FLYZONE 0x40 // for the Beep-Signal
 
extern volatile unsigned char FC_StatusFlags, FC_StatusFlags2;
extern unsigned char FC_StatusFlags3;