Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 792 → Rev 793

/trunk/main.c
227,6 → 227,20
sprintf(ErrorMSG,"ERR: PARACHUTE");
newErrorCode = 43;
}
else if(FC.Error[1] & FC_ERROR1_SPI_RX)
{
LED_RED_ON;
sprintf(ErrorMSG,"FC spi rx error ");
newErrorCode = 8;
StopNavigation = 1;
}
else if(CntSpiErrorPerSecond > 2)
{
LED_RED_ON;
newErrorCode = 8;
sprintf(ErrorMSG,"FC spi CRC error");
UART_VersionInfo.HardwareError[0] |= NC_ERROR0_SPI_RX;
}
else if(FC.Error[0] & FC_ERROR0_GYRO_NICK)
{
LED_RED_ON;
318,13 → 332,6
StopNavigation = 1;
UART_VersionInfo.HardwareError[0] |= NC_ERROR0_COMPASS_VALUE;
}
else if((FC.Error[1] & FC_ERROR1_SPI_RX))
{
LED_RED_ON;
sprintf(ErrorMSG,"FC spi rx error ");
newErrorCode = 8;
StopNavigation = 1;
}
else if(FC.Error[0] & FC_ERROR0_CAREFREE)
{
LED_RED_ON;
596,7 → 603,6
if(CheckDelay(TimerSecond)) // one second Timer
{
TimerSecond += 1000;
 
if(FC.StatusFlags & FC_STATUS_FLY)
{
NaviData.FlyingTime++; // we want to count the battery-time
619,8 → 625,6
}
}
// ++++++++++++++++++++++++++++++++++++++++++++++++
 
 
// ---------------- Error Check Timing ----------------------------
if(CheckDelay(TimerCheckError) || (FC.StatusFlags & FC_STATUS_START && !(oldFcFlags & FC_STATUS_START))) // Timer or FY wants to start
{
654,6 → 658,7
if(SerialLinkOkay < 250 - 6) NCFlags |= NC_FLAG_NOSERIALLINK; // 6 seconds timeout for serial communication
else NCFlags &= ~NC_FLAG_NOSERIALLINK;
if(StopNavigation && (Parameter.NaviGpsModeControl >= 50) && (Parameter.GlobalConfig & FC_CFG_GPS_AKTIV)) BeepTime = 1000;
CntSpiErrorPerSecond = 0;
}
running = 0;
// if(!PollingTimeout) DebugOut.Analog[17]++;