Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2611 → Rev 2612

/trunk/uart.c
846,7 → 846,7
GetPPMChannelAnforderung = 0;
}
#ifndef REDUNDANT_FC_SLAVE
/*
 
if((CheckDelay(Kompass_Timer)) && UebertragungAbgeschlossen)
{
if(!NaviDataOkay) // no external compass needed
861,7 → 861,6
if(JustMK3MagConnected) Kompass_Timer = SetDelay(99);
else Kompass_Timer = SetDelay(999);
}
*/
 
/*
#define EC_VALID 0x01 // only valid if this is 1
909,7 → 908,7
 
#ifdef REDUNDANT_FC_SLAVE
//if(UebertragungAbgeschlossen || MotorenEin)
if(UebertragungAbgeschlossen && (CheckDelay(Kompass_Timer) || MotorenEin))
if(UebertragungAbgeschlossen && (CheckDelay(Kompass_Timer)))
{
static unsigned char who, request;
unsigned char SendRedundantMotor[MAX_MOTORS], i;
922,7 → 921,8
if(PC_MotortestActive) SendRedundantMotor[0] |= 0x80;
SendRedundantMotor[i+1] = Motor[i].SetPoint;
}
Kompass_Timer = SetDelay(25);
if(MotorenEin) Kompass_Timer = SetDelay(2); // fast if Motors are on
else Kompass_Timer = SetDelay(25);
SendOutData('!', FC_ADDRESS, 1, (unsigned char *) &SendRedundantMotor, RequiredMotors+1);
}
#endif