Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2657 → Rev 2658

/trunk/hottmenu.c
103,7 → 103,7
const char PROGMEM UNDERVOLTAGE[] = {" !! LiPo voltage !! "};
const char PROGMEM LANDING[] = {" !! LANDING !! "};
const char PROGMEM SIMULATION[] = {" SIMULATION active "};
const char PROGMEM BOAT_MODE[] = {" MikroKopter (Boat) "};
const char PROGMEM BOAT_MODE[] = {" Boat Mode "};
const char PROGMEM STORE[] = {" Store Position SP1 "};
const char PROGMEM LOAD[] = {" Load Position SP1 "};
const char PROGMEM SETTING[] = {"Set :"};
423,7 → 423,6
unsigned char i = 0;
static unsigned char SpeechMessage = 0;
//Debug("rqst: %02X",packet_request);
 
switch(packet_request)
{
case HOTT_VARIO_PACKET_ID:
556,7 → 555,8
else
if(!CalibrationDone)
{
for(i=0; i<17;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i+2]); // no Error and not calibrated
if(OEM_String[0] == 0xff) for(i=0; i<17;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i+2]); // no Error and not calibrated
else for(i=0; i<16;i++) VarioPacket.Text[i] = OEM_String[i]; // no Error and not calibrated
VarioPacket.Text[16] = '0'+VERSION_MAJOR;
VarioPacket.Text[17] = '.';
VarioPacket.Text[18] = '0'+VERSION_MINOR/10;
566,7 → 566,21
else
{
if(FC_StatusFlags3 & FC_STATUS3_BOAT) for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&BOAT_MODE[i]); // no Error
else for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i]); // no Error
else
{
if(OEM_String[0] == 0xff)
{
for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i]); // no Error
}
else
{
VarioPacket.Text[0] = ' ';
VarioPacket.Text[1] = ' ';
VarioPacket.Text[2] = ' ';
for(i=0; i<16;i++) VarioPacket.Text[i+3] = OEM_String[i]; // no Error and not calibrated
VarioPacket.Text[20] = ' ';
}
}
if(FC_StatusFlags3 & FC_STATUS3_REDUNDANCE_AKTIVE) VarioPacket.Text[0] = 'R';
}
return(sizeof(VarioPacket));
658,7 → 672,6
static int delay;
 
// if(HottKeyboard) {beeptime = 1000;};
switch(page)
{
case 0:
752,7 → 765,11
}
else
if(FC_StatusFlags & FC_STATUS_LOWBAT) HoTT_printfxy(1,7,"!! LiPo voltage !!")
else HoTT_printfxy(0,7," www.MikroKopter.de ");
else
{
if(OEM_String[0] == 0xff) HoTT_printfxy(0,7," www.MikroKopter.de ")
else HoTT_printfxy(0,7," %s ",OEM_String); // no Error and not calibrated
}
break;
case 8: //ASCIIPacket.WarnBeep = HoTT_Waring();
// ASCIIPacket.WarnBeep = Parameter_UserParam1;
876,7 → 893,9
}
else
if(FC_StatusFlags & FC_STATUS_LOWBAT) HoTT_printfxy(1,7,"!! LiPo voltage !!")
else HoTT_printfxy(0,7," www.MikroKopter.de ");
else
if(OEM_String[0] == 0xff) HoTT_printfxy(0,7," www.MikroKopter.de ")
else HoTT_printfxy(0,7," %s ",OEM_String); // no Error and not calibrated
break;
case 8: // ASCIIPacket.WarnBeep = HoTT_Waring();
// ASCIIPacket.WarnBeep = Parameter_UserParam1;