Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1880 → Rev 1888

/branches/V0.84a_ACC-HH_HR_MartinR/jetimenu.c
32,10 → 32,12
JetiBox_printfxy(6,0,"Status");
}
if(NC_ErrorCode) JetiBox_printfxy(6,0,"ERROR: %2d",NC_ErrorCode);
JetiBox_printfxy(0,1,"%4i %2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60);
//JetiBox_printfxy(0,1,"%4i %2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60); // MartinR: so war es
JetiBox_printfxy(0,1,"%4imAh%2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60); // MartinR: geändert
if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG)
{
JetiBox_printfxy(10,1,"%4im%c", (int16_t)(HoehenWert/100),VarioCharacter);
//JetiBox_printfxy(10,1,"%4im%c", (int16_t)(HoehenWert/100),VarioCharacter); // MartinR: so war es
JetiBox_printfxy(12,1,"%3im", (int16_t)(HoehenWert/100)); // MartinR: geändert
}
}
 
56,11 → 58,13
 
}
 
/* // MartinR für Tests Deaktiviert wegen Speicherplatz
void Menu_Battery(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(0,0,"%2i.%1iV %3i.%1iA", UBat/10, UBat%10, Capacity.ActualCurrent/10, Capacity.ActualCurrent%10);
JetiBox_printfxy(0,1,"%4iW %6imAh",Capacity.ActualPower, Capacity.UsedCapacity);
}
*/ // MartinR: Deaktiviert wegen Speicherplatz
 
 
void Menu_PosInfo(uint8_t key)
74,7 → 78,7
JetiBox_printfxy(12,0," 3D");
break;
 
case SATFIX_2D:
//case SATFIX_2D: // MartinR: Deaktiviert wegen Speicherplatz
case SATFIX_NONE:
default:
JetiBox_printfxy(12,0,"NoFx");
93,6 → 97,27
}
 
 
// MartinR für Jeti+ Anfang
void Menu_spoti1(uint8_t key)
{ //0123456789ABCDEF
 
JetiBox_printfxy(0,0,">%3i=Serialpot1",PPM_in[13]);
//JetiBox_printfxy(0,1," %3i=Serialpot2",PPM_in[14]);
if(key== JETIBOX_KEY_UP) PPM_in[13] = PPM_in[13]+25;
if(key== JETIBOX_KEY_DOWN) PPM_in[13] = PPM_in[13]-25;
}
 
void Menu_spoti2(uint8_t key)
{ //0123456789ABCDEF
 
//JetiBox_printfxy(0,0," %3i=Serialpot1",PPM_in[13]);
JetiBox_printfxy(0,1,">%3i=Serialpot2",PPM_in[14],key);
if(key== JETIBOX_KEY_UP) PPM_in[14] = PPM_in[14]+2;
if(key== JETIBOX_KEY_DOWN) PPM_in[14] = PPM_in[14]-2;
}
 
// MartinR für Jeti+ Ende
 
// -----------------------------------------------------------
// the menu topology
// -----------------------------------------------------------
116,10 → 141,17
 
const MENU_ENTRY JetiBox_Menu[] PROGMEM=
{ // l r u d pHandler
{3, 1, 0, 0, &Menu_Status }, // 0
//{3, 1, 0, 0, &Menu_Status }, // 0 // MartinR: so war es
{4, 1, 0, 0, &Menu_Status }, // 0 // MartinR für Jeti+
{0, 2, 1, 1, &Menu_Temperature }, // 1
{1, 3, 2, 2, &Menu_Battery }, // 2
{2, 0, 3, 3, &Menu_PosInfo }, // 3
//{1, 3, 2, 2, &Menu_Battery }, // 2 // MartinR: so war es
//{2, 0, 3, 3, &Menu_PosInfo }, // 3 // MartinR: so war es
{1, 3, 2, 2, &Menu_PosInfo }, // 3 // MartinR: geändert für Jeti+
{2, 4, 3, 3, &Menu_spoti1 }, // 4 // MartinR: für Jeti+
{3, 0, 4, 4, &Menu_spoti2 }, // 4 // MartinR: für Jeti+
};
 
// -----------------------------------------------------------