Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2569 → Rev 2570

/trunk/hottmenu.c
58,8 → 58,9
 
unsigned char NaviData_WaypointIndex = 0;
unsigned char NaviData_WaypointNumber = 0, NaviData_TargetHoldTime = 0, ToNC_Load_WP_List = 0, NaviData_MaxWpListIndex = 0;
unsigned char ToNC_Load_SingePoint = 0, ToNC_Store_SingePoint = 0;
unsigned char ToNC_Load_SingePoint = 0, ToNC_Store_SingePoint = 0, Show_Load = 0, Show_Store = 0;
char WPL_Name[10];// = {" \0"};
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
 
#define HoTT_printf(format, args...) { _printf_P(&LIBFC_HoTT_Putchar, PSTR(format) , ## args);}
103,6 → 104,8
const char PROGMEM LANDING[] = {" !! LANDING !! "};
const char PROGMEM SIMULATION[] = {" SIMULATION active "};
const char PROGMEM BOAT_MODE[] = {" MikroKopter (Boat) "};
const char PROGMEM STORE[] = {" Store Position SP1 "};
const char PROGMEM LOAD[] = {" Load Position SP1 "};
const char PROGMEM SETTING[] = {"Set :"};
const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17] =
{
449,7 → 452,17
VarioPacket.Text[20] = ' ';
}
}
else
if(Show_Store)
{
for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&STORE[i]); // no Error and not calibrated
}
else
if(Show_Load)
{
for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&LOAD[i]); // no Error and not calibrated
}
else
if(NaviData_WaypointNumber)
{
unsigned int tmp_int;
1069,13 → 1082,13
HottKeyboard = 0;
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Bedienung per Taster am Sender
if(Parameter_UserParam5 > 120) //
if(PPM_in[EE_Parameter.MenuKeyChannel] > 120) //
{
hyterese = 2;
if(CheckDelay(delay)) { wp_tmp = 0; hyterese = 1;}
}
else
if(Parameter_UserParam5 < 100)
if(PPM_in[EE_Parameter.MenuKeyChannel] < 100)
{
delay = SetDelay(2500);
if(hyterese == 2 && (wp_tmp < NaviData_MaxWpListIndex))
1150,13 → 1163,13
HottKeyboard = 0;
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Bedienung per Taster am Sender
if(Parameter_UserParam5 > 120) //
if(PPM_in[EE_Parameter.MenuKeyChannel] > 120) //
{
hyterese = 2;
if(CheckDelay(delay)) { wp_tmp = 0; hyterese = 1;}
}
else
if(Parameter_UserParam5 < 100)
if(PPM_in[EE_Parameter.MenuKeyChannel] < 100)
{
delay = SetDelay(2500);
if(hyterese == 2 && (wp_tmp < NaviData_MaxWpListIndex))