Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 734 → Rev 735

/trunk/gpspos.h
20,7 → 20,7
s32 North; // in cm deviation from target
s32 East; // in cm deviation from target
s32 Bearing; // in deg to target
s32 Distance; // in cm to target
s32 Distance_cm; // in cm to target
} __attribute__((packed)) GPS_Pos_Deviation_t;
 
/*
/trunk/gpx.c
653,7 → 653,7
sprintf(string, "<TargetBearing>%03d</TargetBearing>\r\n", NaviData.TargetPositionDeviation.Bearing);
CheckSumAndWrite(&Check16Block,string, doc->file);
// Target Distance in dm
sprintf(string, "<TargetDistance>%d</TargetDistance>\r\n", NaviData.TargetPositionDeviation.Distance);
sprintf(string, "<TargetDistance>%d</TargetDistance>\r\n", NaviData.TargetPositionDeviation.Distance_dm);
CheckSumAndWrite(&Check16Block,string, doc->file);
// Course in deg
sprintf(string, "<Course>%03d</Course>\r\n", NaviData.Heading);
/trunk/main.c
745,7 → 745,7
{
u32 angle;
angle = (360 + GyroCompassCorrected/10 + Parameter.OrientationAngle * 15) % 360;
if(NCFlags & NC_FLAG_FREE || NaviData.TargetPositionDeviation.Distance > 7*10)
if(NCFlags & NC_FLAG_FREE || NaviData.TargetPositionDeviation.Distance_dm > 7*10)
{ // take actual position
if(!PointList_Move(1,&(GPSData.Position),angle)) PointList_Clear(); // try to move wp-list so that 1st entry matches the current position
}
/trunk/main.h
14,7 → 14,7
 
#define VERSION_MAJOR 2
#define VERSION_MINOR 13
#define VERSION_PATCH 5
#define VERSION_PATCH 7
// 0 = A
// 1 = B
// 2 = C