/trunk/GPS.h |
---|
35,7 → 35,6 |
extern GPS_Pos_t SimulationPosition; // the current GPS position in simulated mode |
extern GPS_Pos_t GPS_FailsafePosition; |
extern u8 SimulationFlags; |
extern u8 MK_FlyingWithGps; |
void GPS_Init(void); |
void GPS_Navigation(gps_data_t *pGPS_Data, GPS_Stick_t* pGPS_Stick); |
/trunk/gpx.c |
---|
187,7 → 187,7 |
fputs_(string, doc->file); |
sprintf(string, "</MagSensor>\r\n");fputs_(string, doc->file); |
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
sprintf(string, "<FailSafeTime>%d</FailSafeTime>\r\n",Parameter.FailSafeTime);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);}; |
643,7 → 643,7 |
} |
*/ |
// Navigation Update speed (in 0.1Hz) |
// sprintf(string, "<NaviUpdate>%d,%d,%d</NaviUpdate>\r\n",FreqGpsProcessedIn5Sec,FreqNewGpsDataIn5Sec,DebugOut.Analog[13]); // [13] = GPS CRC Error |
// sprintf(string, "<NaviUpdate>%d,%d</NaviUpdate>\r\n",FreqGpsProcessedIn5Sec,FreqNewGpsDataIn5Sec); |
// fputs_(string, doc->file); |
// eof extensions |
sprintf(string, "</extensions>\r\n"); |
/trunk/main.c |
---|
101,7 → 101,7 |
volatile FC_t FC; |
volatile u32 SPIWatchDog = 15000; // stop Navigation if this goes to zero |
volatile u32 SD_WatchDog = 15000; // stop Logging if this goes to zero |
u32 CountGpsProcessedIn5Sec = 50,CountNewGpsDataIn5Sec = 25, FreqGpsProcessedIn5Sec = 0, FreqNewGpsDataIn5Sec = 0; |
u32 CountGpsProcessedIn5Sec = 0,CountNewGpsDataIn5Sec = 0, FreqGpsProcessedIn5Sec = 0, FreqNewGpsDataIn5Sec = 0; |
u8 NewWPL_Name = 0; |
u32 MaxWP_Radius_in_m = 0; |
s8 ErrorMSG[25]; |
393,12 → 393,6 |
sprintf(ErrorMSG,"No GPS Fix "); |
newErrorCode = 30; |
} |
else if((FreqNewGpsDataIn5Sec < 45 || FreqNewGpsDataIn5Sec > 60) && TimeSinceMotorStart > 10) |
{ |
LED_RED_ON; |
sprintf(ErrorMSG,"GPS Update rate "); |
newErrorCode = 38; |
} |
else if(NC_GPS_ModeCharacter == 'F') |
{ |
sprintf(ErrorMSG,"FAILSAFE pos.! "); |
485,11 → 479,9 |
{ |
count5sec = 0; |
FreqGpsProcessedIn5Sec = CountGpsProcessedIn5Sec * 2; |
FreqNewGpsDataIn5Sec = CountNewGpsDataIn5Sec; |
// FreqNewGpsDataIn5Sec = CountNewGpsDataIn5Sec * 2; |
FreqNewGpsDataIn5Sec = CountNewGpsDataIn5Sec * 2; |
CountGpsProcessedIn5Sec = 0; |
CountNewGpsDataIn5Sec = FreqNewGpsDataIn5Sec / 2; |
// CountNewGpsDataIn5Sec = 0; |
CountNewGpsDataIn5Sec = 0; |
} |
} |
oldFcFlags = FC.StatusFlags; |
/trunk/main.h |
---|
14,7 → 14,7 |
#define VERSION_MAJOR 2 |
#define VERSION_MINOR 10 |
#define VERSION_PATCH 3 |
#define VERSION_PATCH 2 |
// 0 = A |
// 1 = B |
// 2 = C |
36,7 → 36,7 |
// 18 = S |
#ifndef FOLLOW_ME |
#define FC_SPI_COMPATIBLE 76 // <------------------ |
#define FC_SPI_COMPATIBLE 75 // <------------------ |
#else |
#define FC_SPI_COMPATIBLE 0xFF |
#endif |
242,7 → 242,6 |
u8 HomeYawMode; |
u8 Speak100m; |
u8 AutoWpEventValue; |
u8 FailSafeTime; |
} __attribute__((packed)) Param_t; |
typedef struct |