Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 456 → Rev 457

/trunk/gpx.c
470,8 → 470,8
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);
// sprintf(string, "<NaviUpdate>%d,%d</NaviUpdate>\r\n",FreqGpsProcessedIn5Sec,FreqNewGpsDataIn5Sec);
// fputs_(string, doc->file);
// RC Received Signal Strength Indication
// eof extensions
sprintf(string, "</extensions>\r\n");
/trunk/main.c
102,7 → 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;
u32 CountGpsProcessedIn5Sec = 0,CountNewGpsDataIn5Sec = 0, FreqGpsProcessedIn5Sec = 0, FreqNewGpsDataIn5Sec = 0;
 
s8 ErrorMSG[25];
 
425,10 → 425,10
if(++count5sec == 5)
{
count5sec = 0;
FreqGpsProcessedFromStart = CountGpsProcessedFromStart * 2;
FreqNewGpsDataFromStart = CountNewGpsDataFromStart * 2;
CountGpsProcessedFromStart = 0;
CountNewGpsDataFromStart = 0;
FreqGpsProcessedIn5Sec = CountGpsProcessedIn5Sec * 2;
FreqNewGpsDataIn5Sec = CountNewGpsDataIn5Sec * 2;
CountGpsProcessedIn5Sec = 0;
CountNewGpsDataIn5Sec = 0;
}
}
oldFcFlags = FC.StatusFlags;
/trunk/main.h
14,7 → 14,7
 
#define VERSION_MAJOR 0
#define VERSION_MINOR 31
#define VERSION_PATCH 5
#define VERSION_PATCH 8
// 0 = A
// 1 = B
// 2 = C
206,6 → 206,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;
extern u32 CountGpsProcessedIn5Sec,CountNewGpsDataIn5Sec, FreqGpsProcessedIn5Sec, FreqNewGpsDataIn5Sec;
 
#endif // _MAIN_H
/trunk/menu.c
441,10 → 441,10
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,"!!");
LCD_printfxy(0,2,"GPS-Data: %2i.%iHz ",FreqNewGpsDataIn5Sec/10, FreqNewGpsDataIn5Sec%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(FreqGpsProcessedIn5Sec >= 350) LCD_printfxy(18,3,"OK") else LCD_printfxy(18,3,"!!");
break;
default:
//MaxMenuItem = MenuItem - 1;
/trunk/params.h
8,6 → 8,8
#define NCPARAMS_ALTITUDE_RATE 3
#define NCPARAMS_ALTITUDE_SETPOINT 4
#define NCPARAMS_SHOW_TARGET 5
#define NCPARAMS_WP_EVENT_ONCE 6
#define NCPARAMS_WP_EVENT_FOREVER 7
 
#define NCPARAM_STATE_UNDEFINED 0
#define NCRARAM_STATE_VALID 1
/trunk/spi_slave.c
402,8 → 402,24
ToFlightCtrl.Param.sInt[3] = NaviData.HomePositionDeviation.Bearing; // deg //6&7
if(FC_WP_EventChannel > 254) FC_WP_EventChannel = 254; // Muss in SPI_NCCMD_GPSINFO bleiben! (siehe oben)
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);
// ++++++++++++++++++++++++++++++++++
// Waypoint event +++++++++++++++++++
// ++++++++++++++++++++++++++++++++++
if(NCRARAM_STATE_VALID == NCParams_GetValue(NCPARAMS_WP_EVENT_ONCE, &tmp))
{
ToFlightCtrl.Param.Byte[8] = (s8)(tmp - 127);
NCParams_ClearValue(NCPARAMS_WP_EVENT_ONCE);
NCParams_ClearValue(NCPARAMS_WP_EVENT_FOREVER);
}
else
if(NCRARAM_STATE_VALID == NCParams_GetValue(NCPARAMS_WP_EVENT_FOREVER, &tmp))
{
ToFlightCtrl.Param.Byte[8] = (s8)(tmp - 127);
if(tmp == 0) NCParams_ClearValue(NCPARAMS_WP_EVENT_FOREVER);
}
else 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))
{
ToFlightCtrl.Param.Byte[9] = (u8)tmp;