Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1511 → Rev 1512

/trunk/jetimenu.c
24,6 → 24,7
JetiBox_printfxy(0,0,"+ Flight-Ctrl + ");
JetiBox_printfxy(0,1,"HW:%d.%d SW:%d.%d%c",PlatinenVersion/10,PlatinenVersion%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a');
}
/*
#define JETI_MENU_VOLT_RC 1
void mfc1(uint8_t key)
{
30,18 → 31,24
JetiBox_printfxy(0,0,"Volt RC-Level");
JetiBox_printfxy(0,1,"%2i.%1iV %03i",UBat/10, UBat%10, SenderOkay);
}
*/
#define JETI_MENU_HEIGHT 2
void mfc2(uint8_t key)
{
JetiBox_printfxy(0,0,"Height Vario");
if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG)
{
JetiBox_printfxy(0,1,"%5i %5i", (int16_t)(HoehenWert/5), VarioMeter);
}
else
JetiBox_printfxy(11,1,"%4im", (int16_t)(HoehenWert/100));
}
JetiBox_printfxy(0,0,"%2i.%1iV",UBat/10, UBat%10);
 
JetiBox_printfxy(0,1,"%4i %2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60);
if(NaviDataOkay)
{
JetiBox_printfxy(0,1,"no press. sensor");
JetiBox_printfxy(7,0,"%03dm %03d%c", GPSInfo.HomeDistance/10,GPSInfo.HomeBearing, 0xDF);
}
else
JetiBox_printfxy(7,0,"Status");
 
}
#define JETI_MENU_ATTITUDE 3
void mfc3(uint8_t key)
52,12 → 59,12
#define JETI_MENU_AKKU 4
void mfc4(uint8_t key)
{ //0123456789ABCDEF
JetiBox_printfxy(0,0,"U[V] I[A] C[mAh]");
JetiBox_printfxy(0,0," [V] [A] [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
#define JETI_MENU_NCINFO 5
void mnc1(uint8_t key)
{
JetiBox_printfxy(1,0,"+ Navi-Ctrl +");
70,7 → 77,7
JetiBox_printfxy(0,1," Not found! ");
}
}
#define JETI_MENU_GPSINFO 5
#define JETI_MENU_GPSINFO 6
void mnc2(uint8_t key)
{
JetiBox_printfxy(0,0,"Sat:%02d", GPSInfo.NumOfSats);
120,13 → 127,12
 
const MENU_ENTRY JetiBox_Menu[] PROGMEM=
{ // l r u d pHandler
{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
{0, 4, 0, 1, &mfc0 }, // 0
{0, 3, 0, 1, &mfc2 }, // 1
{1, 3, 0, 2, &mfc3 }, // 2
{2, 0, 0, 3, &mfc4 }, // 3
{0, 4, 4, 5, &mnc1 }, // 4
{5, 5, 4, 6, &mnc2 } // 5
};
 
 
/trunk/libfc.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/main.c
57,7 → 57,7
unsigned char SendVersionToNavi = 1;
unsigned char BattLowVoltageWarning = 94;
unsigned int FlugMinuten = 0,FlugMinutenGesamt = 0;
 
unsigned int FlugSekunden = 0;
pVoidFnct_pVoidFnctChar_const_fmt _printf_P;
 
// -- Parametersatz aus EEPROM lesen ---
420,6 → 420,7
else BearbeiteRxDaten();
if(CheckDelay(timer))
{
static unsigned char second;
timer += 20; // 20 ms interval
if(PcZugriff) PcZugriff--;
else
458,9 → 459,14
 
SPI_StartTransmitPacket();
SendSPI = 4;
 
if(!MotorenEin) timer2 = 1450; // 0,5 Minuten aufrunden
 
else
if(++second == 49)
{
second = 0;
FlugSekunden++;
}
if(++timer2 == 2930) // eine Minute
{
timer2 = 0;
/trunk/main.h
84,7 → 84,7
void SetActiveParamSetNumber(unsigned char number);
void LipoDetection(unsigned char print);
extern unsigned char EEPromArray[];
extern unsigned int FlugMinuten,FlugMinutenGesamt;
extern unsigned int FlugMinuten,FlugMinutenGesamt,FlugSekunden;
 
#include <stdlib.h>
#include <string.h>