Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 556 → Rev 557

/trunk/gpspos.h
4,6 → 4,7
#define INVALID 0x00
#define NEWDATA 0x01
#define PROCESSED 0x02
#define SIMULATION 0x03
 
typedef struct
{
/trunk/gpx.c
119,6 → 119,7
fwrite_((void*)GPX_DOCUMENT_HEADER1, sizeof(GPX_DOCUMENT_HEADER1)-1,1,doc->file);// write the gpx-header to the document.
sprintf(string, "<desc>FC HW:%d.%d SW:%d.%02d%c + NC HW:%d.%d SW:%d.%02d%c + BL HW:V%d SW:%d.%02d", (FC_Version.Hardware & 0x7F)/10,(FC_Version.Hardware & 0x7F)%10, FC_Version.Major, FC_Version.Minor, 'a'+FC_Version.Patch, UART_VersionInfo.HWMajor/10, UART_VersionInfo.HWMajor%10, VERSION_MAJOR, VERSION_MINOR, 'a'+ VERSION_PATCH,BLv,UART_VersionInfo.BL_Firmware/100,UART_VersionInfo.BL_Firmware%100);
fputs_(string, doc->file);
if(SimulationFlags) { sprintf(string, " SIMULATED"); fputs_(string, doc->file);};
if(FC.RedundanceBlOperation) sprintf(string, " (Redundant)</desc>\r\n");
else sprintf(string, "</desc>\r\n");
fputs_(string, doc->file);
385,7 → 386,6
else sprintf(string,"<ele>%ld.%03ld</ele>\r\n",i32_1,i32_2);
fputs_(string, doc->file);
// write <time> tag only at a resolution of 1/100 second
// sprintf(string, "<time>%04d-%02d-%02dT%02d:%02d:%02dZ</time>\r\n",SystemTime.Year, SystemTime.Month, SystemTime.Day, SystemTime.Hour, SystemTime.Min, SystemTime.Sec);
sprintf(string, "<time>%04d-%02d-%02dT%02d:%02d:%02d.%dZ</time>\r\n",SystemTime.Year, SystemTime.Month, SystemTime.Day, SystemTime.Hour, SystemTime.Min, SystemTime.Sec,SystemTime.mSec/100);
fputs_(string, doc->file);
// write <sat> tag
437,14 → 437,9
fputs_(string, doc->file);
break;
case 4:
/* if(FC.RC_RSSI)
{
sprintf(string, "<RCRSSI>%d</RCRSSI>\r\n", FC.RC_RSSI);
fputs_(string, doc->file);
}
*/ // Compassind deg
i16_1 = FromFlightCtrl.GyroHeading / 10;
sprintf(string, "<Compass>%03d,%03d,%03d,%03d</Compass>\r\n", i16_1,ToFlightCtrl.CompassHeading,CompassSetpointCorrected/10,GyroCompassCorrected/10);
// Compass in deg
if(SimulationFlags) sprintf(string, "<Compass>%03d,%03d,%03d,%03d</Compass>\r\n",SimulatedDirection,SimulatedDirection,CompassSetpointCorrected/10,SimulatedDirection);
else sprintf(string, "<Compass>%03d,%03d,%03d,%03d</Compass>\r\n",FromFlightCtrl.GyroHeading/10,ToFlightCtrl.CompassHeading,CompassSetpointCorrected/10,GyroCompassCorrected/10);
fputs_(string, doc->file);
// magnetic field
sprintf(string, "<MagnetField>%03d</MagnetField>\r\n",(u16) (EarthMagneticFieldFiltered/5));