Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 752 → Rev 754

/branches/V0.68d Code Redesign killagreg/menu.c
15,7 → 15,9
#include "uart.h"
#include "printf_P.h"
#include "analog.h"
#ifdef USE_MM3
#include "mm3.h"
#endif
#include "ubx.h"
#include "_Settings.h"
 
49,8 → 51,13
// Display with 20 characters in 4 lines
void LCD_PrintMenu(void)
{
static uint8_t MaxMenuItem = 14, MenuItem=0;
#ifdef USE_MM3
static uint8_t MaxMenuItem = 14;
#else
static uint8_t MaxMenuItem = 12;
#endif
 
static uint8_t MenuItem=0;
// if KEY1 is activated goto previous menu item
if(RemoteButtons & KEY1)
{
171,19 → 178,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
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);
LCD_printfxy(0,3,"Z_Offset: %3i",MM3_calib.Z_off);
break;
case 13://MM3 Range
LCD_printfxy(0,0,"MM3 Range");
LCD_printfxy(0,1,"X_Range: %4i",MM3_calib.X_range);
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 Lat/Lon coords
case 12://GPS Lat/Lon coords
if (GPSInfo.status == INVALID)
{
LCD_printfxy(0,0,"No data available!");
210,6 → 205,20
LCD_printfxy(0,3,"Alt: %d.%d m",GPSInfo.altitude/1000L,GPSInfo.altitude%1000L);
}
break;
#ifdef USE_MM3
case 13:// 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);
LCD_printfxy(0,3,"Z_Offset: %3i",MM3_calib.Z_off);
break;
case 14://MM3 Range
LCD_printfxy(0,0,"MM3 Range");
LCD_printfxy(0,1,"X_Range: %4i",MM3_calib.X_range);
LCD_printfxy(0,2,"Y_Range: %4i",MM3_calib.Y_range);
LCD_printfxy(0,3,"Z_Range: %4i",MM3_calib.Z_range);
break;
#endif
default: MaxMenuItem = MenuItem - 1;
MenuItem = 0;
break;