Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 452 → Rev 453

/trunk/gpx.c
469,6 → 469,9
// RC Quality
sprintf(string, "<RCQuality>%d</RCQuality>\r\n", FC.RC_Quality);
fputs_(string, doc->file);
// Navigation Update speed (in 0.1Hz)
sprintf(string, "<NaviUpdate>%d,%d</NaviUpdate>\r\n",FreqGpsProcessedFromStart,FreqNewGpsDataFromStart);
fputs_(string, doc->file);
// RC Received Signal Strength Indication
// eof extensions
sprintf(string, "</extensions>\r\n");
/trunk/main.c
102,6 → 102,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 CountGpsProcessedFromStart = 0,CountNewGpsDataFromStart = 0, FreqGpsProcessedFromStart = 0, FreqNewGpsDataFromStart = 0;
 
s8 ErrorMSG[25];
 
404,7 → 405,7
 
void Polling(void)
{
static u8 running = 0, oldFcFlags = 0;
static u8 running = 0, oldFcFlags = 0, count5sec;
if(running) return;
running = 1;
SPI0_UpdateBuffer(); // also calls the GPS-functions
417,7 → 418,18
// ---------------- Error Check Timing ----------------------------
if(CheckDelay(TimerCheckError) || (FC.StatusFlags & FC_STATUS_START && !(oldFcFlags & FC_STATUS_START))) // Timer or FY wants to start
{
TimerCheckError = SetDelay(1000);
if(CheckDelay(TimerCheckError))
{
TimerCheckError = SetDelay(1000);
if(++count5sec == 5)
{
count5sec = 0;
FreqGpsProcessedFromStart = CountGpsProcessedFromStart * 2;
FreqNewGpsDataFromStart = CountNewGpsDataFromStart * 2;
CountGpsProcessedFromStart = 0;
CountNewGpsDataFromStart = 0;
}
}
oldFcFlags = FC.StatusFlags;
if(CheckDelay(SPI0_Timeout) && (DebugUART == UART1)) GPS_Navigation(&GPSData, &(ToFlightCtrl.GPSStick)); // process the GPS data even if the FC is not connected
/trunk/main.h
14,7 → 14,7
 
#define VERSION_MAJOR 0
#define VERSION_MINOR 30
#define VERSION_PATCH 7
#define VERSION_PATCH 8
// 0 = A
// 1 = B
// 2 = C
205,5 → 205,6
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 CountGpsProcessedFromStart,CountNewGpsDataFromStart, FreqGpsProcessedFromStart, FreqNewGpsDataFromStart;
 
#endif // _MAIN_H
/trunk/menu.c
74,7 → 74,7
 
 
u8 MenuItem = 0;
u8 MaxMenuItem = 20;
u8 MaxMenuItem = 21;
 
void Menu_Putchar(char c)
{
435,10 → 435,17
LCD_printfxy(0,2,"Declination:%c%i.%1i ", sign, abs(GeoMagDec)/10,abs(GeoMagDec)%10);
LCD_printfxy(0,3,"Inclination:%2i (%2i)", EarthMagneticInclination, EarthMagneticInclinationTheoretic);
break;
case 20: // User Parameter
case 20:
LCD_printfxy(0,0,"SD-Setting ");
LCD_printfxy(0,2,"WP-Dynamic:%4i ",WaypointAcceleration);
break;
case 21:
LCD_printfxy(0,0,"CPU Processing ");
LCD_printfxy(0,2,"GPS-Data: %2i.%iHz ",FreqNewGpsDataFromStart/10, FreqNewGpsDataFromStart%10);
LCD_printfxy(0,3,"GPS-Update:%2i.%iHz ",FreqGpsProcessedFromStart/10, FreqGpsProcessedFromStart%10);
if(FreqNewGpsDataFromStart >= 48 && FreqNewGpsDataFromStart <= 52) LCD_printfxy(18,2,"OK") else LCD_printfxy(18,2,"!!");
if(FreqGpsProcessedFromStart >= 243) LCD_printfxy(18,3,"OK") else LCD_printfxy(18,3,"!!");
break;
default:
//MaxMenuItem = MenuItem - 1;
MenuItem = 0;