Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 732 → Rev 733

/branches/V0.68d Code Redesign killagreg/GPS.c
35,7 → 35,7
int32_t GPSPosDev_North = 0, GPSPosDev_East = 0;
 
// poti2 enables the gps feature
if(Poti2 > 70) // run GPS function only if Poti 2 is larger than 70 (switch on)
if((Poti2 > 70) && (!EmergencyLanding)) // run GPS function only if Poti 2 is larger than 70 (switch on)
{
switch(GPSInfo.status)
{
/branches/V0.68d Code Redesign killagreg/fc.c
101,6 → 101,7
 
// flags
uint8_t MotorsOn = 0;
uint8_t EmergencyLanding = 0;
 
int32_t TurnOver180Pitch = 250000L, TurnOver180Roll = 250000L;
 
445,7 → 446,6
static uint16_t RcLostTimer;
static uint8_t delay_neutral = 0, delay_startmotors = 0, delay_stopmotors = 0;
static uint16_t Modell_Is_Flying = 0;
static uint8_t EmergencyLanding = 0;
static uint8_t HightControlActive = 0;
static int16_t HightControlThrust = 0;
static int8_t TimerDebugOut = 0;
/branches/V0.68d Code Redesign killagreg/fc.h
84,6 → 84,7
// current stick elongations
extern int16_t MaxStickPitch, MaxStickRoll, MaxStickYaw;
extern uint8_t MotorsOn;
extern uint8_t EmergencyLanding;
 
 
#endif //_FC_H