Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2607 → Rev 2608

/trunk/hottmenu.c
97,7 → 97,7
ElectricAirPacket_t ElectricAirPacket;
HoTTGeneral_t HoTTGeneral;
unsigned char SpeakHoTT = SPEAK_MIKROKOPTER;
unsigned char ToNC_SpeakHoTT = 0, ShowSettingNameTime = 0;
unsigned char ToNC_SpeakHoTT = 0, ShowSettingNameTime = 0, ShowCmpsCalibrateTime = 0;
int HoTTVarioMeter = 0;
const char PROGMEM MIKROKOPTER[] = {" MikroKopter "};
const char PROGMEM UNDERVOLTAGE[] = {" !! LiPo voltage !! "};
107,6 → 107,18
const char PROGMEM STORE[] = {" Store Position SP1 "};
const char PROGMEM LOAD[] = {" Load Position SP1 "};
const char PROGMEM SETTING[] = {"Set :"};
 
const char PROGMEM CALIBRATE_TEXT[6][21] =
{
//0123456789123456
"Finished \0", // 0
"Compass Calibration \0", // 1
"1:Rotate Nick & Roll\0", // 2
"2: idle \0", // 3
"3:Rotate Nick & Roll\0", // 4
"4:Stored \0", // 5
};
 
const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17] =
{
//0123456789123456
148,7 → 160,11
"Failsafe postion\0", // 35
"No Redundancy! \0", // 36
"Redundancy test \0", // 37
"GPS Update Rate \0" // 38
"GPS Update Rate \0", // 38
"Canbus Error \0", // 39
"5V RC-Supply \0", // 40
"Power-Supply \0", // 41
"ACC not calibr. \0", // 42
};
 
 
194,6 → 210,10
{SPEAK_ERROR,0}, // "No Redundancy!", // 36
{0,0}, // "Redundancy test", // 37
{SPEAK_ERR_GPS,0}, // "GPS Update Rate", // 38
{SPEAK_ERR_DATABUS,0}, // "Canbus Error! // 39
{SPEAK_ERROR,0}, // "5V Supply" // 40
{SPEAK_UNDERVOLTAGE,0},// "Power Supply" // 41
{SPEAK_ERR_SENSOR,0}, // "ACC not calibr. ", // 42
};
 
/*
428,6 → 448,11
VarioPacket.Text[20] = ' ';
}
else
if(ShowCmpsCalibrateTime)
{
for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&CALIBRATE_TEXT[WinkelOut.CalcState][i]);
}
else
if(LowVoltageLandingActive) for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&LANDING[i]); // no Error
else
if(FC_StatusFlags & FC_STATUS_LOWBAT) for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&UNDERVOLTAGE[i]); // no Error
/trunk/hottmenu.h
110,7 → 110,7
//"ERR:Redundanz ?"
*/
 
#define MAX_ERR_NUMBER (38+1)
#define MAX_ERR_NUMBER (42+1)
extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17];
extern unsigned int NaviData_TargetDistance;
extern unsigned char MaxBlTemperture;
119,7 → 119,7
 
extern unsigned char HottKeyboard,HoTT_RequestedSensor;
extern unsigned char HottUpdate(unsigned char key);
extern unsigned char SpeakHoTT,ShowSettingNameTime;
extern unsigned char SpeakHoTT,ShowSettingNameTime, ShowCmpsCalibrateTime;
extern unsigned char ToNC_SpeakHoTT;
extern volatile unsigned char *HoTT_DataPointer;