WebSVN - NaviCtrl - Diff - Rev 581 and 582



#include "main.h"
#include "led.h"
#include "timer2.h"
#include "logging.h"
#include "ncmag.h"
#include "uart0.h"

 
//________________________________________________________________________________________________________________________________________
// Function:    GPX_DocumentInit(GPX_Document_t *)
//

                if(FC.StatusFlags3 & FC_STATUS3_REDUNDANCE) 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);
         sprintf(string, "<MK_Time>%imin</MK_Time>\r\n",FlugMinutenGesamt);fputs_(string, doc->file);
     sprintf(string, "<GpsVersion>%d.%03d</GpsVersion>\r\n",GPS_Version/1000,GPS_Version%1000);fputs_(string, doc->file);
         sprintf(string, "<License>\r\n");      fputs_(string, doc->file);
           if(tmp_license->User[0] != 0)
           {
                sprintf(string, "<name>%s</name>\r\n",tmp_license->User); fputs_(string, doc->file);
                sprintf(string, "<email>%s</email>\r\n",tmp_license->eMail); fputs_(string, doc->file);

          sprintf(string, "</License>\r\n"); fputs_(string, doc->file);
          sprintf(string, "<settings>\r\n"); fputs_(string, doc->file);
                sprintf(string, "<Number>%i</Number>\r\n",Parameter.ActiveSetting);fputs_(string, doc->file);
                sprintf(string, "<CompassOffset>%i</CompassOffset>\r\n",FC.FromFC_CompassOffset/10);fputs_(string, doc->file);
                sprintf(string, "<FCOrientation>%i</FCOrientation>\r\n",Parameter.OrientationAngle*15);fputs_(string, doc->file);
                sprintf(string, "<GeoMag>%i.%1d</GeoMag>\r\n",GeoMagDec/10,GeoMagDec%10);fputs_(string, doc->file);
        sprintf(string, "<Neutral>%d,%d,%d</Neutral>\r\n", FC.AdNeutralNick,FC.AdNeutralRoll,FC.AdNeutralYaw);fputs_(string, doc->file);
                if((FC.StatusFlags3 & FC_STATUS3_BOAT)) {sprintf(string, "<BoatMode>On</BoatMode>\r\n");fputs_(string, doc->file);}
                if(Parameter.Driftkomp) {sprintf(string, "<DriftComp>%i</DriftComp>\r\n",Parameter.Driftkomp);fputs_(string, doc->file);};
                if(Compass_I2CPort == NCMAG_PORT_EXTERN) sprintf(string, "<MagSensor>external (%i)</MagSensor>\r\n",NCMAG_Orientation);
                else sprintf(string, "<MagSensor>internal</MagSensor>\r\n");fputs_(string, doc->file);

                                  sprintf(string, "<Neutral>%d,%d,%d</Neutral>\r\n", FC.AdNeutralNick,FC.AdNeutralRoll,FC.AdNeutralYaw);
                                  fputs_(string, doc->file);
                                 }
*/
                                // Navigation Update speed (in 0.1Hz)
//                              sprintf(string, "<NaviUpdate>%d,%d</NaviUpdate>\r\n",FreqGpsProcessedIn5Sec,FreqNewGpsDataIn5Sec);
//                              fputs_(string, doc->file);
                                // eof extensions
                                sprintf(string, "</extensions>\r\n");
                                fputs_(string, doc->file);
                                sprintf(string, "</trkpt>\r\n");
                                fputs_(string, doc->file);

Rev 581	Rev 582
Line 67...	Line 67...
67	#include "main.h"	67	#include "main.h"
68	#include "led.h"	68	#include "led.h"
69	#include "timer2.h"	69	#include "timer2.h"
70	#include "logging.h"	70	#include "logging.h"
71	#include "ncmag.h"	71	#include "ncmag.h"
-		72	#include "uart0.h"
Line 72...	Line 73...
72		73
73	//________________________________________________________________________________________________________________________________________	74	//________________________________________________________________________________________________________________________________________
74	// Function: GPX_DocumentInit(GPX_Document_t *)	75	// Function: GPX_DocumentInit(GPX_Document_t *)
75	//	76	//
Line 123...	Line 124...
123	if(FC.StatusFlags3 & FC_STATUS3_REDUNDANCE) sprintf(string, " (Redundant)</desc>\r\n");	124	if(FC.StatusFlags3 & FC_STATUS3_REDUNDANCE) sprintf(string, " (Redundant)</desc>\r\n");
124	else sprintf(string, "</desc>\r\n");	125	else sprintf(string, "</desc>\r\n");
125	fputs_(string, doc->file);	126	fputs_(string, doc->file);
126	sprintf(string, "<extensions>\r\n"); fputs_(string, doc->file);	127	sprintf(string, "<extensions>\r\n"); fputs_(string, doc->file);
127	sprintf(string, "<MK_Time>%imin</MK_Time>\r\n",FlugMinutenGesamt);fputs_(string, doc->file);	128	sprintf(string, "<MK_Time>%imin</MK_Time>\r\n",FlugMinutenGesamt);fputs_(string, doc->file);
-		129	sprintf(string, "<GpsVersion>%d.%03d</GpsVersion>\r\n",GPS_Version/1000,GPS_Version%1000);fputs_(string, doc->file);
128	sprintf(string, "<License>\r\n"); fputs_(string, doc->file);	130	sprintf(string, "<License>\r\n"); fputs_(string, doc->file);
129	if(tmp_license->User[0] != 0)	131	if(tmp_license->User[0] != 0)
130	{	132	{
131	sprintf(string, "<name>%s</name>\r\n",tmp_license->User); fputs_(string, doc->file);	133	sprintf(string, "<name>%s</name>\r\n",tmp_license->User); fputs_(string, doc->file);
132	sprintf(string, "<email>%s</email>\r\n",tmp_license->eMail); fputs_(string, doc->file);	134	sprintf(string, "<email>%s</email>\r\n",tmp_license->eMail); fputs_(string, doc->file);
Line 140...	Line 142...
140	sprintf(string, "</License>\r\n"); fputs_(string, doc->file);	142	sprintf(string, "</License>\r\n"); fputs_(string, doc->file);
141	sprintf(string, "<settings>\r\n"); fputs_(string, doc->file);	143	sprintf(string, "<settings>\r\n"); fputs_(string, doc->file);
142	sprintf(string, "<Number>%i</Number>\r\n",Parameter.ActiveSetting);fputs_(string, doc->file);	144	sprintf(string, "<Number>%i</Number>\r\n",Parameter.ActiveSetting);fputs_(string, doc->file);
143	sprintf(string, "<CompassOffset>%i</CompassOffset>\r\n",FC.FromFC_CompassOffset/10);fputs_(string, doc->file);	145	sprintf(string, "<CompassOffset>%i</CompassOffset>\r\n",FC.FromFC_CompassOffset/10);fputs_(string, doc->file);
144	sprintf(string, "<FCOrientation>%i</FCOrientation>\r\n",Parameter.OrientationAngle*15);fputs_(string, doc->file);	146	sprintf(string, "<FCOrientation>%i</FCOrientation>\r\n",Parameter.OrientationAngle*15);fputs_(string, doc->file);
145	sprintf(string, "<GeoMag>%i</GeoMag>\r\n",GeoMagDec/10);fputs_(string, doc->file);	147	sprintf(string, "<GeoMag>%i.%1d</GeoMag>\r\n",GeoMagDec/10,GeoMagDec%10);fputs_(string, doc->file);
146	sprintf(string, "<Neutral>%d,%d,%d</Neutral>\r\n", FC.AdNeutralNick,FC.AdNeutralRoll,FC.AdNeutralYaw);fputs_(string, doc->file);	148	sprintf(string, "<Neutral>%d,%d,%d</Neutral>\r\n", FC.AdNeutralNick,FC.AdNeutralRoll,FC.AdNeutralYaw);fputs_(string, doc->file);
147	if((FC.StatusFlags3 & FC_STATUS3_BOAT)) {sprintf(string, "<BoatMode>On</BoatMode>\r\n");fputs_(string, doc->file);}	149	if((FC.StatusFlags3 & FC_STATUS3_BOAT)) {sprintf(string, "<BoatMode>On</BoatMode>\r\n");fputs_(string, doc->file);}
148	if(Parameter.Driftkomp) {sprintf(string, "<DriftComp>%i</DriftComp>\r\n",Parameter.Driftkomp);fputs_(string, doc->file);};	150	if(Parameter.Driftkomp) {sprintf(string, "<DriftComp>%i</DriftComp>\r\n",Parameter.Driftkomp);fputs_(string, doc->file);};
149	if(Compass_I2CPort == NCMAG_PORT_EXTERN) sprintf(string, "<MagSensor>external (%i)</MagSensor>\r\n",NCMAG_Orientation);	151	if(Compass_I2CPort == NCMAG_PORT_EXTERN) sprintf(string, "<MagSensor>external (%i)</MagSensor>\r\n",NCMAG_Orientation);
150	else sprintf(string, "<MagSensor>internal</MagSensor>\r\n");fputs_(string, doc->file);	152	else sprintf(string, "<MagSensor>internal</MagSensor>\r\n");fputs_(string, doc->file);
Line 575...	Line 577...
575	sprintf(string, "<Neutral>%d,%d,%d</Neutral>\r\n", FC.AdNeutralNick,FC.AdNeutralRoll,FC.AdNeutralYaw);	577	sprintf(string, "<Neutral>%d,%d,%d</Neutral>\r\n", FC.AdNeutralNick,FC.AdNeutralRoll,FC.AdNeutralYaw);
576	fputs_(string, doc->file);	578	fputs_(string, doc->file);
577	}	579	}
578	*/	580	*/
579	// Navigation Update speed (in 0.1Hz)	581	// Navigation Update speed (in 0.1Hz)
580	sprintf(string, "<NaviUpdate>%d,%d</NaviUpdate>\r\n",FreqGpsProcessedIn5Sec,FreqNewGpsDataIn5Sec);	582	// sprintf(string, "<NaviUpdate>%d,%d</NaviUpdate>\r\n",FreqGpsProcessedIn5Sec,FreqNewGpsDataIn5Sec);
581	fputs_(string, doc->file);	583	// fputs_(string, doc->file);
582	// eof extensions	584	// eof extensions
583	sprintf(string, "</extensions>\r\n");	585	sprintf(string, "</extensions>\r\n");
584	fputs_(string, doc->file);	586	fputs_(string, doc->file);
585	sprintf(string, "</trkpt>\r\n");	587	sprintf(string, "</trkpt>\r\n");
586	fputs_(string, doc->file);	588	fputs_(string, doc->file);

Subversion Repositories NaviCtrl

(root)/tags/V2.18a/gpx.c @ 812 - Rev 581 → 582