Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 613 → Rev 614

/trunk/gpx.c
121,7 → 121,7
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.StatusFlags3 & FC_STATUS3_REDUNDANCE) sprintf(string, " (Redundant)</desc>\r\n");
if(FC.StatusFlags3 & FC_STATUS3_REDUNDANCE_AKTIVE) sprintf(string, " (Redundant)</desc>\r\n");
else sprintf(string, "</desc>\r\n");
fputs_(string, doc->file);
sprintf(string, "<extensions>\r\n"); fputs_(string, doc->file);
570,6 → 570,13
sprintf(string, "<Servo>%d,%d,%d</Servo>\r\n", ServoParams.NickControl,ServoParams.RollControl,POI_KameraNick/10); // Raw Poti-Values of the Servo control and the POI_Nick in 1°
fputs_(string, doc->file);
 
if(NC_GPS_ModeCharacter == 'F') // Failsafe Point is active
{
sprintf(string, "<WP>FAIL,%d,%d,%d</WP>\r\n",NaviData.WaypointIndex,NaviData.WaypointNumber,LogFC_WP_EventChannel); // x of y Waypoints and the actual value of the Event Channel
LogFC_WP_EventChannel = 0;
}
else
{
if(GPS_pWaypoint != NULL) // if WP exist
{ // copy that name
u8 i;
581,7 → 588,9
}
sprintf(string, "<WP>%s,%d,%d,%d</WP>\r\n",name,NaviData.WaypointIndex,NaviData.WaypointNumber,LogFC_WP_EventChannel); // x of y Waypoints and the actual value of the Event Channel
LogFC_WP_EventChannel = 0; // can be cleared now
}
fputs_(string, doc->file);
 
sprintf(string, "<ShutterCnt>%d</ShutterCnt>\r\n",NaviData_Volatile.ShutterCounter);
LogFC_WP_EventChannel = 0; // can be cleared now
fputs_(string, doc->file);