/trunk/GPS.c |
---|
588,9 → 588,17 |
if(GPS_pWaypoint != NULL) // Waypoint exist |
{ |
// possible new data have been put into wp-list |
if(GPS_pWaypoint->Position.Status == NEWDATA) |
{ |
WPTime = SetDelay(GPS_pWaypoint->HoldTime * 1000); // update hold time stamp |
NCFlags &= ~NC_FLAG_TARGET_REACHED; |
} |
// update the hold position |
GPS_CopyPosition(&(GPSData.Position), &GPS_HoldPosition); |
// set target to the waypoint |
GPS_pTargetPosition = &(GPS_pWaypoint->Position); |
// update target radius |
GPS_TargetRadius = (s32)(GPS_pWaypoint->ToleranceRadius) * 100L; |
} |
/trunk/logging.c |
---|
438,6 → 438,8 |
} |
} |
else // a logging error has occured |
{ // try to reinitialize sd-card when motors are not running |
if(!(FC.MKFlags & MKFLAG_MOTOR_RUN)) |
{ |
if(Fat16_IsValid()) // wait for reinizialization of fat16 from outside |
{ |
449,6 → 451,7 |
{ // retry in 5 seconds |
logtimer = SetDelay(5000); // try again in 5 sec |
} |
} // EOF motors are not running |
} //EOF logfile error |
} // EOF CheckDelay |
}// EOF Card in Slot |
/trunk/uart1.c |
---|
441,7 → 441,11 |
break; |
case 1: // set |
NCParams_SetValue(SerialMsg.pData[1], (s16*)(&SerialMsg.pData[2])); |
{ |
s16 value; |
value = SerialMsg.pData[2] + (s16)SerialMsg.pData[3] * 0x0100; |
NCParams_SetValue(SerialMsg.pData[1], &value); |
} |
break; |
default: |