Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 721 → Rev 722

/branches/V0.68d Code Redesign killagreg/menu.c
48,7 → 48,7
// Display with 20 characters in 4 lines
void LCD_PrintMenu(void)
{
static uint8_t MaxMenuItem = 14, MenuItem=0;
static uint8_t MaxMenuItem = 16, MenuItem=0;
 
// if KEY1 is activated goto previous menu item
if(RemoteButtons & KEY1)
182,11 → 182,10
LCD_printfxy(0,2,"Y_Range: %4i",MM3_calib.Y_range);
LCD_printfxy(0,3,"Z_Range: %4i",MM3_calib.Z_range);
break;
case 14://GPS Status
LCD_printfxy(0,0,"GPS Status");
case 14://GPS Lat/Lon coords
if (GPSInfo.status == INVALID)
{
LCD_printfxy(0,1,"No data available!");
LCD_printfxy(0,0,"No data available!");
}
else
{
193,20 → 192,77
switch (GPSInfo.satfix)
{
case SATFIX_NONE:
LCD_printfxy(0,1,"Satfix: None");
LCD_printfxy(0,0,"Satfix: None ");
break;
case SATFIX_2D:
LCD_printfxy(0,1,"Satfix: 2D");
LCD_printfxy(0,0,"Satfix: 2D ");
break;
case SATFIX_3D:
LCD_printfxy(0,1,"Satfix: 3D");
LCD_printfxy(0,0,"Satfix: 3D ");
break;
default:
LCD_printfxy(0,1,"Satfix: Unknown");
LCD_printfxy(0,0,"Satfix: Unknown");
break;
}
LCD_printfxy(0,1,"Lon: %d.%d deg",GPSInfo.longitude/10000000L, (int16_t)(GPSInfo.longitude/100000L)%100);
LCD_printfxy(0,2,"Lat: %d.%d deg",GPSInfo.latitude/10000000L, GPSInfo.latitude%10000000L);
LCD_printfxy(0,3,"Alt: %d.%d m",GPSInfo.altitude/1000L,GPSInfo.altitude%1000L);
}
break;
case 15://GPS UTM coords
if (GPSInfo.status == INVALID)
{
LCD_printfxy(0,0,"No data available!");
}
else
{
switch (GPSInfo.satfix)
{
case SATFIX_NONE:
LCD_printfxy(0,0,"No Satfix ");
break;
case SATFIX_2D:
LCD_printfxy(0,0,"Satfix: 2D ");
break;
case SATFIX_3D:
LCD_printfxy(0,0,"Satfix: 3D ");
break;
default:
LCD_printfxy(0,0,"Unknown Satfix ");
break;
}
LCD_printfxy(0,1,"N: %d",(int16_t)(GPSInfo.utmnorth/100L));
LCD_printfxy(0,2,"E: %d",(int16_t)(GPSInfo.utmeast/100L));
LCD_printfxy(0,3,"A: %d",(int16_t)(GPSInfo.utmalt/100L));
}
break;
case 16://GPS UTM velocity
if (GPSInfo.status == INVALID)
{
LCD_printfxy(0,0,"No data available!");
}
else
{
switch (GPSInfo.satfix)
{
case SATFIX_NONE:
LCD_printfxy(0,0,"No Satfix ");
break;
case SATFIX_2D:
LCD_printfxy(0,0,"Satfix: 2D ");
break;
case SATFIX_3D:
LCD_printfxy(0,0,"Satfix: 3D ");
break;
default:
LCD_printfxy(0,0,"Unknown Satfix ");
break;
}
LCD_printfxy(0,1,"VN: %d",GPSInfo.velnorth);
LCD_printfxy(0,2,"VE: %d",GPSInfo.veleast);
LCD_printfxy(0,3,"VA: %d",GPSInfo.veltop);
}
break;
default: MaxMenuItem = MenuItem - 1;
MenuItem = 0;
break;