Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 751 → Rev 752

/branches/V0.68d Code Redesign killagreg/menu.c
19,6 → 19,7
#include "ubx.h"
#include "_Settings.h"
 
 
#define ARRAYSIZE 10
uint8_t Array[ARRAYSIZE] = {1,2,3,4,5,6,7,8,9,10};
#define DISPLAYBUFFSIZE 80
48,7 → 49,7
// Display with 20 characters in 4 lines
void LCD_PrintMenu(void)
{
static uint8_t MaxMenuItem = 16, MenuItem=0;
static uint8_t MaxMenuItem = 14, MenuItem=0;
 
// if KEY1 is activated goto previous menu item
if(RemoteButtons & KEY1)
170,7 → 171,7
LCD_printfxy(0,2,"Gs:%4i Ya:%4i ",ExternControl.Thrust, ExternControl.Yaw);
LCD_printfxy(0,3,"Hi:%4i Cf:%4i ",ExternControl.Hight, ExternControl.Config);
break;
case 12:// MM3 Kompass
case 12:// MM3 Kompass
LCD_printfxy(0,0,"MM3 Offset");
LCD_printfxy(0,1,"X_Offset: %3i",MM3_calib.X_off);
LCD_printfxy(0,2,"Y_Offset: %3i",MM3_calib.Y_off);
192,16 → 193,16
switch (GPSInfo.satfix)
{
case SATFIX_NONE:
LCD_printfxy(0,0,"Satfix: None ");
LCD_printfxy(0,0,"Sats: %d Fix: No", GPSInfo.satnum);
break;
case SATFIX_2D:
LCD_printfxy(0,0,"Satfix: 2D ");
LCD_printfxy(0,0,"Sats: %d Fix: 2D", GPSInfo.satnum);
break;
case SATFIX_3D:
LCD_printfxy(0,0,"Satfix: 3D ");
LCD_printfxy(0,0,"Sats: %d Fix: 3D", GPSInfo.satnum);
break;
default:
LCD_printfxy(0,0,"Satfix: Unknown");
LCD_printfxy(0,0,"Sats: %d Fix: ??", GPSInfo.satnum);
break;
}
LCD_printfxy(0,1,"Lon: %d.%d deg",GPSInfo.longitude/10000000L, (GPSInfo.longitude%10000000L)/10000L);
209,60 → 210,6
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;