Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 707 → Rev 708

/trunk/menu.c
64,6 → 64,7
#include "compass.h"
#include "spi_slave.h"
#include "menu.h"
#include "uart0.h"
#include "uart1.h"
#include "ncmag.h"
#include "logging.h"
71,6 → 72,7
#include "sdc.h"
#include "analog.h"
#include "canbus.h"
#include "triggerlog.h"
 
u8 DispPtr = 0;
s8 DisplayBuff[DISPLAYBUFFSIZE];
115,7 → 117,11
{
// Version Info
case 0:
LCD_printfxy(0,0,"++ Navi-Ctrl ++");
if(IamMaster == SLAVE) LCD_printfxy(0,0,"+ Navi-Ctrl (S) +")
else
if(IamMaster == MASTER)LCD_printfxy(0,0,"+ Navi-Ctrl (M) +")
else LCD_printfxy(0,0,"++ Navi-Ctrl ++")
 
LCD_printfxy(0,1,"HW V%d.%d SW V%d.%02d%c", UART_VersionInfo.HWMajor/10, UART_VersionInfo.HWMajor%10, VERSION_MAJOR, VERSION_MINOR, 'a'+ VERSION_PATCH);
if(FC.StatusFlags3 & FC_STATUS3_REDUNDANCE_AKTIVE) LCD_printfxy(19,1,"R");
if(ErrorCode)
209,7 → 215,7
else sign = '+';
i1 = abs(GPSData.Position.Altitude)/1000L;
i2 = abs(GPSData.Position.Altitude)%1000L;
LCD_printfxy(0,3,"Alt:%c%04ld.%03ld m", sign, i1, i2);
LCD_printfxy(0,3,"Alt:%c%04ld.%03ldm V%d", sign, i1, i2, GPS_Version/1000);
}
break;
case 3:
424,8 → 430,9
LCD_printfxy(0,0,"SD-Card Logs");
if(SDCardInfo.Valid == 1)
{
LCD_printfxy(0,1,"GPX:%4i (%3ims) ",Logged_GPX_Counter,LogCfg.GPX_Interval);
LCD_printfxy(0,2,"KML:%4i (%3ims) ",Logged_KML_Counter,LogCfg.KML_Interval);
LCD_printfxy(0,1,"GPX: %4i (%3ims) ",Logged_GPX_Counter,LogCfg.GPX_Interval);
LCD_printfxy(0,2,"KML: %4i (%3ims) ",Logged_KML_Counter,LogCfg.KML_Interval);
LCD_printfxy(0,3,"Trig:%4i ",Logged_TRIG_Counter);
}
else
LCD_printfxy(0,1,"no card in slot ");
612,6 → 619,21
*/
 
case 29:
LCD_printfxy(0,0,"Trigger Input");
if(UART_VersionInfo.HWMajor >= 30)
{
if(BlitzSchuhConnected) LCD_printfxy(0,1,"External")
else LCD_printfxy(0,1,"Internal");
LCD_printfxy(0,2,"Counter:%4d ",TrigLogging.Count);
LCD_printfxy(0,3,"Logfile:%4i ",Logged_TRIG_Counter);
}
else
{
LCD_printfxy(0,1,"Not Supported in ");
LCD_printfxy(0,2,"Hardware V%d ", UART_VersionInfo.HWMajor/10);
LCD_printfxy(0,3,"(V3 required)");
}
 
// LCD_printfxy(0,0,"PPM Input");
/*
LCD_printfxy(0,0,"%4i %4i %4i %4i",PPM_In[1],PPM_In[2],PPM_In[3],PPM_In[4]);
618,11 → 640,11
LCD_printfxy(0,1,"%4i %4i %4i %4i",PPM_In[5],PPM_In[6],PPM_In[7],PPM_In[8]);
LCD_printfxy(0,2,"%4i %4i %4i %4i",PPM_In[9],PPM_In[10],PPM_In[11],PPM_In[12]);
LCD_printfxy(0,3,"%4i %4i %4i %4i",PPM_In[13],PPM_In[14],PPM_In[15],PPM_In[16]);
*/
LCD_printfxy(0,0,"%4i %4i %4i %4i",PPM_In[17],PPM_In[18],PPM_In[19],PPM_In[20]);
LCD_printfxy(0,1,"%4i %4i %4i %4i",PPM_In[21],PPM_In[22],PPM_In[23],PPM_In[24]);
LCD_printfxy(0,2,"%4i %4i %4i %4i",PPM_In[25],PPM_In[26],PPM_In[27],PPM_In[28]);
LCD_printfxy(0,3,"%4i %4i %4i %4i",PPM_In[29],PPM_In[30],PPM_In[31],PPM_In[32]);
*/
break;
default:
//MaxMenuItem = MenuItem - 1;