Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2691 → Rev 2692

/trunk/hottmenu.c
106,6 → 106,7
const char PROGMEM BOAT_MODE[] = {" Boat Mode "};
const char PROGMEM STORE[] = {" Store Position SP1 "};
const char PROGMEM LOAD[] = {" Load Position SP1 "};
const char PROGMEM FLYZONE[] = {" Flyzone: points "};
const char PROGMEM SETTING[] = {"Set :"};
 
const char PROGMEM CALIBRATE_TEXT[6][21] =
166,6 → 167,8
"Power-Supply \0", // 41
"ACC not calibr. \0", // 42
"Parachute! \0", // 43
"Outside Flyzone \0", // 44
"No Flyzone \0", // 45
};
 
 
215,7 → 218,9
{SPEAK_RECEIV_VOLT,0}, // "5V Supply" // 40
{SPEAK_UNDERVOLTAGE,0},// "Power Supply" // 41
{SPEAK_ERR_SENSOR,0}, // "ACC not calibr. ", // 42
{SPEAK_MK_OFF,0}, // "Parachute", // 43
{SPEAK_MK_OFF,0}, // "Parachute", // 43
{SPEAK_MAX_RANGE,0}, // "Outside Area", // 44
{SPEAK_ERROR,0} // "No Flyzone", // 45
};
 
/*
546,7 → 551,14
VarioPacket.Text[18] = 's';
VarioPacket.Text[19] = ' ';
VarioPacket.Text[20] = ' ';
if(FlyzonePointCnt >= 3) VarioPacket.Text[20] = 'F';
}
else if(FlyzonePointCnt)
{
for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&FLYZONE[i]);
if(FlyzonePointCnt >=10) VarioPacket.Text[9] = '0'+(FlyzonePointCnt) / 10;
VarioPacket.Text[10] = '0'+(FlyzonePointCnt) % 10;
}
else
if(NC_To_FC_Flags & NC_TO_FC_SIMULATION_ACTIVE)
{
986,7 → 998,6
if(HoTTBlink)
{
LIBFC_HoTT_SetPos(6 * 21);
// if(!(Parameter_GlobalConfig & CFG_ACHSENKOPPLUNG_AKTIV)) HoTT_printf_BLINK("COUPLING OFF! ");
if(EE_Parameter.BitConfig & (CFG_LOOP_LINKS | CFG_LOOP_RECHTS | CFG_LOOP_UNTEN | CFG_LOOP_OBEN)) HoTT_printf_BLINK("LOOPING! ");
if(Parameter_GlobalConfig & CFG_HEADING_HOLD) HoTT_printf_BLINK("HH! ");
if(!(Parameter_GlobalConfig & CFG_KOMPASS_AKTIV)) HoTT_printf_BLINK("COMPASS OFF! ");
1023,6 → 1034,7
// HoTT_printfxy(0,1,"(Absolute)");
break;
case 1:
if(FlyzonePointCnt) HoTT_printfxy(0,5,"Flyzone:%2d points",FlyzonePointCnt) else Hott_ClearLine(5);
if(NaviData_WaypointNumber) HoTT_printfxy(0,6,"Active WP:%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
else HoTT_printfxy(0,6,"No WPs active ")
break;
1071,6 → 1083,7
HoTT_printfxy(0,1,"(Fixed Positions)");
break;
case 1:
if(FlyzonePointCnt) HoTT_printfxy(0,5,"Flyzone:%2d points",FlyzonePointCnt) else Hott_ClearLine(5);
if(NaviData_WaypointNumber) HoTT_printfxy(0,6,"Active WP:%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
else HoTT_printfxy(0,6,"No WPs active ")
break;
/trunk/hottmenu.h
111,7 → 111,7
//"ERR:Redundanz ?"
*/
 
#define MAX_ERR_NUMBER (43+1)
#define MAX_ERR_NUMBER (45+1)
extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17];
extern unsigned int NaviData_TargetDistance;
extern unsigned char MaxBlTemperture;