| /trunk/gpx.c |
|---|
| 428,7 → 428,8 |
| if(name[i] < ' ') name[i] = ' '; |
| } |
| } |
| sprintf(string, "<WP>%s,%d,%d,%d</WP>\r\n",name,NaviData.WaypointIndex,NaviData.WaypointNumber,FC_WP_EventChannel); // x of y Waypoints and the actual value of the Event Channel |
| 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); |
| break; |
| case 7: |
| /trunk/logging.c |
|---|
| 312,7 → 312,7 |
| { |
| case LOGFILE_IDLE: |
| case LOGFILE_CLOSED: |
| if((GPSData.Status != INVALID) && (GPSData.Flags & FLAG_GPSFIXOK) && (GPSData.SatFix == SATFIX_3D) && (FC.StatusFlags & FC_STATUS_FLY)) |
| if((GPSData.Status != INVALID) && (GPSData.NumOfSats > 2) && /*(GPSData.Flags & FLAG_GPSFIXOK) && (GPSData.SatFix == SATFIX_3D)*/ (FC.StatusFlags & FC_STATUS_FLY)) |
| { |
| logfilestate = LOGFILE_START; |
| } |
| 357,7 → 357,7 |
| break; |
| case LOGFILE_OPENED: |
| // append new gps log data |
| measure_time = CountMilliseconds; |
| measure_time = CountMilliseconds; |
| if((GPSData.Status != INVALID) && (GPSData.Flags & FLAG_GPSFIXOK) && (GPSData.SatFix == SATFIX_3D)) |
| { |
| if(!GPX_LoggGPSCoordinates(&logfile,part)) |
| /trunk/spi_slave.c |
|---|
| 107,7 → 107,7 |
| u8 SPI_CommandCounter = 0; |
| s32 ToFC_Rotate_C = 64, ToFC_Rotate_S = 0; |
| s32 HeadFreeStartAngle = 0; |
| s16 FC_WP_EventChannel = 0; // gibt einen Schaltkanal an die FC weiter, wenn der Wegpunkt erreicht wurde |
| s16 FC_WP_EventChannel = 0, LogFC_WP_EventChannel = 0; // gibt einen Schaltkanal an die FC weiter, wenn der Wegpunkt erreicht wurde |
| u32 ToFC_AltitudeRate = 0; |
| s32 ToFC_AltitudeSetpoint = 0; |
| u8 FromFC_VarioCharacter = ' '; |
| 391,6 → 391,7 |
| ToFlightCtrl.Param.Int[2] = NaviData.HomePositionDeviation.Distance; // dm //4&5 |
| ToFlightCtrl.Param.sInt[3] = NaviData.HomePositionDeviation.Bearing; // deg //6&7 |
| if(FC_WP_EventChannel > 254) FC_WP_EventChannel = 254; |
| if(FC_WP_EventChannel) LogFC_WP_EventChannel = FC_WP_EventChannel; // to make sure that it will be logged |
| ToFlightCtrl.Param.Byte[8] = (s8)(FC_WP_EventChannel - 127); |
| FC_WP_EventChannel = 0; // the GPS-Routine will set it again |
| if(NCRARAM_STATE_VALID == NCParams_GetValue(NCPARAMS_ALTITUDE_RATE, &tmp)) |
| /trunk/spi_slave.h |
|---|
| 36,7 → 36,7 |
| extern s32 ToFcGpsZ; |
| extern s32 ToFC_Rotate_C, ToFC_Rotate_S; |
| extern s32 HeadFreeStartAngle; |
| extern s16 FC_WP_EventChannel; |
| extern s16 FC_WP_EventChannel,LogFC_WP_EventChannel; |
| extern u32 ToFC_AltitudeRate; |
| extern s32 ToFC_AltitudeSetpoint; |
| extern u8 NC_GPS_ModeCharacter; |