/trunk/Hex-Files |
---|
Property changes: |
Added: svn:ignore |
+Navi-Ctrl_STR9_V2_10e.hex |
/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 = 50,CountNewGpsDataIn5Sec = 25, FreqGpsProcessedIn5Sec = 0, FreqNewGpsData = 0; |
u8 NewWPL_Name = 0; |
u32 MaxWP_Radius_in_m = 0; |
s8 ErrorMSG[25]; |
393,11 → 393,11 |
sprintf(ErrorMSG,"No GPS Fix "); |
newErrorCode = 30; |
} |
else if((FreqNewGpsDataIn5Sec < 45 || FreqNewGpsDataIn5Sec > 60) && TimeSinceMotorStart > 10) |
else if((FreqNewGpsData < 28 || FreqNewGpsData > 60) && TimeSinceMotorStart > 5) |
{ |
LED_RED_ON; |
// sprintf(ErrorMSG,"GPS Update rate "); |
// newErrorCode = 38; |
sprintf(ErrorMSG,"GPS Update rate "); |
newErrorCode = 38; |
} |
else if(NC_GPS_ModeCharacter == 'F') |
{ |
485,11 → 485,9 |
{ |
count5sec = 0; |
FreqGpsProcessedIn5Sec = CountGpsProcessedIn5Sec * 2; |
FreqNewGpsDataIn5Sec = CountNewGpsDataIn5Sec; |
// FreqNewGpsDataIn5Sec = CountNewGpsDataIn5Sec * 2; |
FreqNewGpsData = CountNewGpsDataIn5Sec; |
CountGpsProcessedIn5Sec = 0; |
CountNewGpsDataIn5Sec = FreqNewGpsDataIn5Sec / 2; |
// CountNewGpsDataIn5Sec = 0; |
CountNewGpsDataIn5Sec = FreqNewGpsData / 2; |
} |
} |
oldFcFlags = FC.StatusFlags; |
/trunk/main.h |
---|
13,8 → 13,8 |
//----------------------- |
#define VERSION_MAJOR 2 |
#define VERSION_MINOR 10 |
#define VERSION_PATCH 4 |
#define VERSION_MINOR 11 |
#define VERSION_PATCH 0 |
// 0 = A |
// 1 = B |
// 2 = C |
285,7 → 285,7 |
extern volatile u32 SPIWatchDog; // stop Navigation if this goes to zero |
extern volatile u32 SD_WatchDog; // stop Logging if this goes to zero |
extern volatile u32 PollingTimeout; |
extern u32 CountGpsProcessedIn5Sec,CountNewGpsDataIn5Sec, FreqGpsProcessedIn5Sec, FreqNewGpsDataIn5Sec; |
extern u32 CountGpsProcessedIn5Sec,CountNewGpsDataIn5Sec, FreqGpsProcessedIn5Sec, FreqNewGpsData; |
extern u16 SD_SettingWaitLED; |
extern u16 SD_PosAccuracy; |
/trunk/menu.c |
---|
466,9 → 466,9 |
break; |
case 21: |
LCD_printfxy(0,0,"CPU Processing "); |
LCD_printfxy(0,2,"GPS-Data: %2i.%iHz ",FreqNewGpsDataIn5Sec/10, FreqNewGpsDataIn5Sec%10); |
LCD_printfxy(0,2,"GPS-Data: %2i.%iHz ",FreqNewGpsData/10, FreqNewGpsData%10); |
LCD_printfxy(0,3,"GPS-Update:%2i.%iHz ",FreqGpsProcessedIn5Sec/10, FreqGpsProcessedIn5Sec%10); |
if(FreqNewGpsDataIn5Sec >= 48 && FreqNewGpsDataIn5Sec <= 52) LCD_printfxy(18,2,"OK") else LCD_printfxy(18,2,"!!"); |
if(FreqNewGpsData >= 48 && FreqNewGpsData <= 52) LCD_printfxy(18,2,"OK") else LCD_printfxy(18,2,"!!"); |
if(FreqGpsProcessedIn5Sec >= 350) LCD_printfxy(18,3,"OK") else LCD_printfxy(18,3,"!!"); |
break; |
case 22: |
/trunk/spi_slave.c |
---|
633,7 → 633,7 |
Compass_Init(); |
FCCalibActive = 15; |
FC_is_Calibrated = 0; |
FreqNewGpsDataIn5Sec = 50; |
FreqNewGpsData = 50; |
} |
else |
{ |
/trunk/ubx.c |
---|
294,7 → 294,7 |
// update GPS data only if the status is INVALID or PROCESSED |
if(GPSData.Status != NEWDATA) |
{ // wait for new data at all neccesary ubx messages |
CountNewGpsDataIn5Sec++; |
CountNewGpsDataIn5Sec++; |
GPSData.Status = INVALID; |
// update message cycle time |
GPSData.MsgCycleTime = (u16)(UbxSol.itow-last_itow); |
/trunk/ubx.h |
---|
22,7 → 22,7 |
typedef struct |
{ |
u16 MsgCycleTime; // time in ms since last gps data |
u32 MsgCycleTime; // time in ms since last gps data |
GPS_Pos_t Position; // Lat/Lon/Alt |
u8 Flags; // Status Flags |
u8 NumOfSats; // number of satelites |