Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1498 → Rev 1499

/beta/Code Redesign killagreg/jetimenu.c
6,6 → 6,7
#include "analog.h"
#include "eeprom.h"
#include "main.h"
#include "capacity.h"
#ifdef USE_NAVICTRL
#include "spi.h"
#endif
25,24 → 26,24
// the menu functions
// -----------------------------------------------------------
#define JETI_MENU_FCINFO 0
void mf0(uint8_t key)
{
JetiBox_printfxy(0,0,"+ Flight-Ctrl + ");
void mfc0(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(0,0,"+ Flight-Ctrl +");
JetiBox_printfxy(0,1,"HW:%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a');
}
#define JETI_MENU_VOLT_RC 1
void mf1(uint8_t key)
{
void mfc1(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(0,0,"Volt RC-Level");
JetiBox_printfxy(0,1,"%2i.%1iV %03i",UBat/10, UBat%10, RC_Quality);
}
#define JETI_MENU_HEIGHT 2
void mf2(uint8_t key)
{
JetiBox_printfxy(0,0,"Height Vario");
void mfc2(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(0,0,"Height[m] Vario");
if(ParamSet.Config0 & CFG0_AIRPRESS_SENSOR)
{
JetiBox_printfxy(0,1,"%5i %5i", (int16_t)(ReadingHeight/5), ReadingVario);
JetiBox_printfxy(0,1,"%5i %5i", (int16_t)(ReadingHeight/100), ReadingVario/10);
}
else
{
50,15 → 51,23
}
}
#define JETI_MENU_ATTITUDE 3
void mf3(uint8_t key)
{
void mfc3(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(0,0,"Nick Roll Yaw");
JetiBox_printfxy(0,1,"%4i %4i %4i", (int16_t)(IntegralGyroNick/1024), (int16_t)(IntegralGyroRoll/1024), (int16_t)(YawGyroHeading / GYRO_DEG_FACTOR));
}
#define JETI_MENU_AKKU 4
void mfc4(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(0,0,"U[V] I[A] C[mAh]");
JetiBox_printfxy(0,1,"%2i.%1i %2i.%1i %6i",UBat/10, UBat%10, Capacity.ActualCurrent/10, Capacity.ActualCurrent%10, Capacity.UsedCapacity);
}
 
 
#define JETI_MENU_NCINFO 4
void mf4(uint8_t key)
{
JetiBox_printfxy(0,0," + Navi-Ctrl + ");
void mnc1(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(1,0,"+ Navi-Ctrl +");
#ifdef USE_NAVICTRL
if(NCDataOkay)
{
66,7 → 75,7
}
else
{
JetiBox_printfxy(0,1," Not found! ");
JetiBox_printfxy(1,1,"Not found!");
}
#else
JetiBox_printfxy(0,1,"No NC Support");
73,7 → 82,7
#endif
}
#define JETI_MENU_GPSINFO 5
void mf5(uint8_t key)
void mnc2(uint8_t key)
{
JetiBox_printfxy(0,0,"Sat:%02d", GPSInfo.NumOfSats);
switch (GPSInfo.SatFix)
114,20 → 123,21
 
// the menu navigation structure
/*
0 ----------------------------- 4
0 ----------------------------- 5
| |
3 - 1 - 2 - 3 - 1 5
4 - 1 - 2 - 3 - 4 - 1 6
 
*/
 
const MENU_ENTRY JetiBox_Menu[] PROGMEM=
{ // l r u d pHandler
{0, 4, 0, 1, &mf0 }, // 0
{3, 2, 0, 1, &mf1 }, // 1
{1, 3, 0, 2, &mf2 }, // 2
{2, 1, 0, 3, &mf3 }, // 3
{0, 4, 4, 5, &mf4 }, // 4
{5, 5, 4, 5, &mf5 } // 5
{0, 5, 0, 1, &mfc0 }, // 0
{4, 2, 0, 1, &mfc1 }, // 1
{1, 3, 0, 2, &mfc2 }, // 2
{2, 4, 0, 3, &mfc3 }, // 3
{3, 1, 0, 4, &mfc4 }, // 4
{0, 5, 5, 6, &mnc1 }, // 5
{6, 6, 5, 6, &mnc2 } // 6
};
 
// -----------------------------------------------------------