WebSVN - NaviCtrl - Diff - Rev 573 and 574



                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</GeoMag>\r\n",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);
                if(AbsoluteFlyingAltitude) {sprintf(string, "<MaxAltitude>%i</MaxAltitude>\r\n",AbsoluteFlyingAltitude);fputs_(string, doc->file);}
                if(AbsoluteFlyingRange_m) {sprintf(string, "<FlyRange>%i</FlyRange>\r\n",AbsoluteFlyingRange_m);fputs_(string, doc->file);}
                if(AutoDescendRange_m) {sprintf(string, "<Descend>%i</Descend>\r\n",AutoDescendRange_m);fputs_(string, doc->file);};

 
 
                if((Parameter.GlobalConfig & FC_CFG_HEADING_HOLD))                      {sprintf(string, "<HeadingHold>ON!</HeadingHold>\r\n");fputs_(string, doc->file);}
                if((Parameter.GlobalConfig & FC_CFG_KOMPASS_FIX))                       {sprintf(string, "<KompassFixedValue>ON!</KompassFixedValue>\r\n");fputs_(string, doc->file);}
                if((Parameter.GlobalConfig & FC_CFG_DREHRATEN_BEGRENZER))       {sprintf(string, "<RotationRateLimiter>ON!</RotationRateLimiter>\r\n");fputs_(string, doc->file);}
                if(!(Parameter.GlobalConfig & FC_CFG_ACHSENKOPPLUNG_AKTIV)) {sprintf(string, "<AxisCoupling>OFF!</AxisCoupling>\r\n");fputs_(string, doc->file);}

                                sprintf(string, "<GPSSticks>%d,%d,%d,'%c'</GPSSticks>\r\n", ToFlightCtrl.GPSStick.Nick, ToFlightCtrl.GPSStick.Roll, 0 ,NC_GPS_ModeCharacter);
                                fputs_(string, doc->file);
                                // RC Quality
                                sprintf(string, "<RCQuality>%d</RCQuality>\r\n", FC.RC_Quality);
                                fputs_(string, doc->file);
                                // Drift compensation
/*
                                if(Parameter.Driftkomp)
                                 {
                                  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
                                i32_2 = altitude;
                    if(GPSData.Position.Status == INVALID) i32_2 = 0;

Rev 573	Rev 574
Line 142...	Line 142...
142	sprintf(string, "<Number>%i</Number>\r\n",Parameter.ActiveSetting);fputs_(string, doc->file);	142	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);	143	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);	144	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);	145	sprintf(string, "<GeoMag>%i</GeoMag>\r\n",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);	146	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);}
147	if(Parameter.Driftkomp) {sprintf(string, "<DriftComp>%i</DriftComp>\r\n",Parameter.Driftkomp);fputs_(string, doc->file);};	148	if(Parameter.Driftkomp) {sprintf(string, "<DriftComp>%i</DriftComp>\r\n",Parameter.Driftkomp);fputs_(string, doc->file);};
148	if(Compass_I2CPort == NCMAG_PORT_EXTERN) sprintf(string, "<MagSensor>external (%i)</MagSensor>\r\n",NCMAG_Orientation);	149	if(Compass_I2CPort == NCMAG_PORT_EXTERN) sprintf(string, "<MagSensor>external (%i)</MagSensor>\r\n",NCMAG_Orientation);
149	else sprintf(string, "<MagSensor>internal</MagSensor>\r\n");fputs_(string, doc->file);	150	else sprintf(string, "<MagSensor>internal</MagSensor>\r\n");fputs_(string, doc->file);
150	if(AbsoluteFlyingAltitude) {sprintf(string, "<MaxAltitude>%i</MaxAltitude>\r\n",AbsoluteFlyingAltitude);fputs_(string, doc->file);}	151	if(AbsoluteFlyingAltitude) {sprintf(string, "<MaxAltitude>%i</MaxAltitude>\r\n",AbsoluteFlyingAltitude);fputs_(string, doc->file);}
151	if(AbsoluteFlyingRange_m) {sprintf(string, "<FlyRange>%i</FlyRange>\r\n",AbsoluteFlyingRange_m);fputs_(string, doc->file);}	152	if(AbsoluteFlyingRange_m) {sprintf(string, "<FlyRange>%i</FlyRange>\r\n",AbsoluteFlyingRange_m);fputs_(string, doc->file);}
152	if(AutoDescendRange_m) {sprintf(string, "<Descend>%i</Descend>\r\n",AutoDescendRange_m);fputs_(string, doc->file);};	153	if(AutoDescendRange_m) {sprintf(string, "<Descend>%i</Descend>\r\n",AutoDescendRange_m);fputs_(string, doc->file);};
Line 153...	Line -...
153		-
154	if((FC.StatusFlags3 & FC_STATUS3_BOAT)) {sprintf(string, "<BoatMode>On</BoatMode>\r\n");fputs_(string, doc->file);}	154
155	if((Parameter.GlobalConfig & FC_CFG_HEADING_HOLD)) {sprintf(string, "<HeadingHold>ON!</HeadingHold>\r\n");fputs_(string, doc->file);}	155	if((Parameter.GlobalConfig & FC_CFG_HEADING_HOLD)) {sprintf(string, "<HeadingHold>ON!</HeadingHold>\r\n");fputs_(string, doc->file);}
156	if((Parameter.GlobalConfig & FC_CFG_KOMPASS_FIX)) {sprintf(string, "<KompassFixedValue>ON!</KompassFixedValue>\r\n");fputs_(string, doc->file);}	156	if((Parameter.GlobalConfig & FC_CFG_KOMPASS_FIX)) {sprintf(string, "<KompassFixedValue>ON!</KompassFixedValue>\r\n");fputs_(string, doc->file);}
157	if((Parameter.GlobalConfig & FC_CFG_DREHRATEN_BEGRENZER)) {sprintf(string, "<RotationRateLimiter>ON!</RotationRateLimiter>\r\n");fputs_(string, doc->file);}	157	if((Parameter.GlobalConfig & FC_CFG_DREHRATEN_BEGRENZER)) {sprintf(string, "<RotationRateLimiter>ON!</RotationRateLimiter>\r\n");fputs_(string, doc->file);}
158	if(!(Parameter.GlobalConfig & FC_CFG_ACHSENKOPPLUNG_AKTIV)) {sprintf(string, "<AxisCoupling>OFF!</AxisCoupling>\r\n");fputs_(string, doc->file);}	158	if(!(Parameter.GlobalConfig & FC_CFG_ACHSENKOPPLUNG_AKTIV)) {sprintf(string, "<AxisCoupling>OFF!</AxisCoupling>\r\n");fputs_(string, doc->file);}
Line 551...	Line 551...
551	sprintf(string, "<GPSSticks>%d,%d,%d,'%c'</GPSSticks>\r\n", ToFlightCtrl.GPSStick.Nick, ToFlightCtrl.GPSStick.Roll, 0 ,NC_GPS_ModeCharacter);	551	sprintf(string, "<GPSSticks>%d,%d,%d,'%c'</GPSSticks>\r\n", ToFlightCtrl.GPSStick.Nick, ToFlightCtrl.GPSStick.Roll, 0 ,NC_GPS_ModeCharacter);
552	fputs_(string, doc->file);	552	fputs_(string, doc->file);
553	// RC Quality	553	// RC Quality
554	sprintf(string, "<RCQuality>%d</RCQuality>\r\n", FC.RC_Quality);	554	sprintf(string, "<RCQuality>%d</RCQuality>\r\n", FC.RC_Quality);
555	fputs_(string, doc->file);	555	fputs_(string, doc->file);
556	// Navigation Update speed (in 0.1Hz)	556	// Drift compensation
-		557	/*
557	if(Parameter.Driftkomp)	558	if(Parameter.Driftkomp)
558	{	559	{
559	sprintf(string, "<Neutral>%d,%d,%d</Neutral>\r\n", FC.AdNeutralNick,FC.AdNeutralRoll,FC.AdNeutralYaw);	560	sprintf(string, "<Neutral>%d,%d,%d</Neutral>\r\n", FC.AdNeutralNick,FC.AdNeutralRoll,FC.AdNeutralYaw);
560	fputs_(string, doc->file);	561	fputs_(string, doc->file);
561	}	562	}
-		563	*/
-		564	// Navigation Update speed (in 0.1Hz)
562	// sprintf(string, "<NaviUpdate>%d,%d</NaviUpdate>\r\n",FreqGpsProcessedIn5Sec,FreqNewGpsDataIn5Sec);	565	// sprintf(string, "<NaviUpdate>%d,%d</NaviUpdate>\r\n",FreqGpsProcessedIn5Sec,FreqNewGpsDataIn5Sec);
563	// fputs_(string, doc->file);	566	// fputs_(string, doc->file);
564	// eof extensions	567	// eof extensions
565	i32_2 = altitude;	568	i32_2 = altitude;
566	if(GPSData.Position.Status == INVALID) i32_2 = 0;	569	if(GPSData.Position.Status == INVALID) i32_2 = 0;

Subversion Repositories NaviCtrl

(root)/tags/V2.16a/gpx.c @ 811 - Rev 573 → 574