Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 987 → Rev 988

/branches/KalmanFilter MikeW/gps.c
146,7 → 146,7
/* Set Hold Position */
if ((actualPos.state > 2) &&
((Override == 1) ||
(SwitchPos == 2) )) /* Update the hold position in case we are in target mode */
(SwitchPos == 2) )) /* Update the hold position in case we are in target mode */
{
holdPos.north = actualPos.north;
holdPos.east = actualPos.east;
204,9 → 204,9
if (actualPos.state > 2 )
{
if ((SwitchPos == 2) &&
(targetPosValid == 1) &&
(RemoteLinkLost == 0) &&
(Override == 0))
(targetPosValid == 1) &&
(RemoteLinkLost == 0) &&
(Override == 0))
{ /* determine distance from target position */
distanceNS = actualPos.north - targetPos.north; // in 0.1m
distanceEW = actualPos.east - targetPos.east; // in 0.1m
216,8 → 216,8
}
else if ((SwitchPos == 1)&&
(holdPosValid == 1) &&
(RemoteLinkLost == 0) &&
(Override == 0))
(RemoteLinkLost == 0) &&
(Override == 0))
{ /* determine distance from hold position */
distanceNS = actualPos.north - holdPos.north; // in 0.1m
distanceEW = actualPos.east - holdPos.east; // in 0.1m
236,12 → 236,12
}
else
{
distanceNS = 0.0F; // in 0.1m
distanceEW = 0.0F; // in 0.1m
velocityNS = 0.0F; // in 0.1m/s
velocityEW = 0.0F; // in 0.1m/s
maxDistance = 0.0F;
GPSTrackingCycles = 0;
distanceNS = 0.0F; // in 0.1m
distanceEW = 0.0F; // in 0.1m
velocityNS = 0.0F; // in 0.1m/s
velocityEW = 0.0F; // in 0.1m/s
maxDistance = 0.0F;
GPSTrackingCycles = 0;
}
/* Limit GPS_Nick to 25 */