Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2560 → Rev 2561

/trunk/hottmenu.c
144,11 → 144,11
"compass sensor \0", // 34
"Failsafe postion\0", // 35
"No Redundancy! \0", // 36
"Redundancy test \0" // 37
"Redundancy test \0", // 37
"GPS Update Rate \0" // 38
};
 
};
 
 
const char PROGMEM HOTT_ERROR[MAX_ERR_NUMBER][2] =
{ // 1 -> only in flight 0 -> also on ground
//0123456789123456
189,7 → 189,8
{SPEAK_ERR_COMPASS,0}, // "compass sensor" // 34
{SPEAK_ERROR,1}, // "Failsafe postion0", // 35
{SPEAK_ERROR,0}, // "No Redundancy!", // 36
{0,0} // "Redundancy test", // 37
{0,0}, // "Redundancy test", // 37
{SPEAK_ERR_GPS,0}, // "GPS Update Rate", // 38
};
 
/*
585,6 → 586,7
static unsigned char line, page = 0,show_current = 0,show_mag = 0, show_poti = 0,hyterese = 1;
unsigned char tmp;
HoTTVarioMeter = (HoTTVarioMeter * 7 + VarioMeter) / 8;
static int delay;
 
// if(HottKeyboard) {beeptime = 1000;};
1067,19 → 1069,21
HottKeyboard = 0;
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Bedienung per Taster am Sender
if(Parameter_UserParam5 > 120 && !hyterese) //
if(Parameter_UserParam5 > 120) //
{
hyterese = 1;
if(wp_tmp < NaviData_MaxWpListIndex)
hyterese = 2;
if(CheckDelay(delay)) { wp_tmp = 0; hyterese = 1;}
}
else
if(Parameter_UserParam5 < 100)
{
delay = SetDelay(2500);
if(hyterese == 2 && (wp_tmp < NaviData_MaxWpListIndex))
{
wp_tmp++;
ToNC_Store_SingePoint = wp_tmp;
changed = 0;
}
}
else
if(Parameter_UserParam5 < 100)
{
hyterese = 0;
}
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1146,23 → 1150,24
HottKeyboard = 0;
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Bedienung per Taster am Sender
if(Parameter_UserParam5 > 120 && !hyterese) //
if(Parameter_UserParam5 > 120) //
{
hyterese = 1;
if(wp_tmp < NaviData_MaxWpListIndex)
hyterese = 2;
if(CheckDelay(delay)) { wp_tmp = 0; hyterese = 1;}
}
else
if(Parameter_UserParam5 < 100)
{
delay = SetDelay(2500);
if(hyterese == 2 && (wp_tmp < NaviData_MaxWpListIndex))
{
wp_tmp++;
ToNC_Load_SingePoint = wp_tmp;
changed = 0;
}
}
else
if(Parameter_UserParam5 < 100)
{
hyterese = 0;
}
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
break;
default: line = 0;
break;
/trunk/hottmenu.h
110,7 → 110,7
//"ERR:Redundanz ?"
*/
 
#define MAX_ERR_NUMBER (37+1)
#define MAX_ERR_NUMBER (38+1)
extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17];
extern unsigned int NaviData_TargetDistance;
extern unsigned char MaxBlTemperture;
/trunk/jetimenu.c
258,8 → 258,8
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
void Menu_POINT_SV2(uint8_t key)
{ //0123456789ABCDEF
static unsigned char load_waypoint_tmp = 1, changed, hyterese = 1;
 
static unsigned char load_waypoint_tmp = 0, changed, hyterese = 1;
static int delay;
// if(WPL_Name[0] == 0) JetiBox_printfxy(0,0,"Relative WPs ")
// else JetiBox_printfxy(0,0,"Rel:%s",WPL_Name);
JetiBox_printfxy(0,0,"Save Point:");
269,7 → 269,8
if(GPSInfo.SatFix != SATFIX_3D) JetiBox_printfxy(0,1,"no GPS-Fix")
else
{
JetiBox_printfxy(11,0,"%2d",load_waypoint_tmp);
if(load_waypoint_tmp) JetiBox_printfxy(11,0,"%2d",load_waypoint_tmp)
else JetiBox_printfxy(11,0,"--");
 
// if(NaviData_WaypointNumber) JetiBox_printfxy(8,1,"%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
// else JetiBox_printfxy(8,1,"--/--")
286,22 → 287,25
ToNC_Store_SingePoint = load_waypoint_tmp;
changed = 0;
}
 
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Bedienung per Taster am Sender
if(Parameter_UserParam5 > 120 && !hyterese) //
if(Parameter_UserParam5 > 120) //
{
hyterese = 1;
if(load_waypoint_tmp < NaviData_MaxWpListIndex)
hyterese = 2;
if(CheckDelay(delay)) { load_waypoint_tmp = 0; hyterese = 1;}
}
else
if(Parameter_UserParam5 < 100)
{
delay = SetDelay(2500);
if(hyterese == 2 && (load_waypoint_tmp < NaviData_MaxWpListIndex))
{
load_waypoint_tmp++;
ToNC_Store_SingePoint = load_waypoint_tmp;
// SpeakHoTT = SPEAK_MIKROKOPTER;
changed = 0;
// JetiBeep = 'A'; // "MikroKopter"
}
}
else
if(Parameter_UserParam5 < 100)
{
hyterese = 0;
}
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
312,8 → 316,8
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
void Menu_POINT_LD2(uint8_t key)
{ //0123456789ABCDEF
static unsigned char load_waypoint_tmp = 1, changed, hyterese = 1;
static unsigned char load_waypoint_tmp = 0, changed, hyterese = 1;
static int delay;
// if(WPL_Name[0] == 0) JetiBox_printfxy(0,0,"FIX Waypoints")
// else JetiBox_printfxy(0,0,"FIX:%s",WPL_Name);
JetiBox_printfxy(0,0,"Load Point")
321,7 → 325,8
if(NaviData_MaxWpListIndex == 0) JetiBox_printfxy(0,1,"no SD-Card")
else
{
JetiBox_printfxy(11,0,"%2d",load_waypoint_tmp);
if(load_waypoint_tmp) JetiBox_printfxy(11,0,"%2d",load_waypoint_tmp)
else JetiBox_printfxy(11,0,"--");
 
if(NaviData_WaypointNumber) JetiBox_printfxy(0,1,"Dist:%3d Alt:%3d ",NaviData_TargetDistance,(int16_t)(FromNC_AltitudeSetpoint/100))
else JetiBox_printfxy(8,1," ");
339,19 → 344,22
}
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Bedienung per Taster am Sender
if(Parameter_UserParam5 > 120 && !hyterese) //
if(Parameter_UserParam5 > 120) //
{
hyterese = 1;
if(load_waypoint_tmp < NaviData_MaxWpListIndex)
hyterese = 2;
if(CheckDelay(delay)) { load_waypoint_tmp = 0; hyterese = 1;}
}
else
if(Parameter_UserParam5 < 100)
{
delay = SetDelay(2500);
if(hyterese == 2 && (load_waypoint_tmp < NaviData_MaxWpListIndex))
{
load_waypoint_tmp++;
ToNC_Load_SingePoint = load_waypoint_tmp;
changed = 0;
// JetiBeep = 'A'; // "MikroKopter"
}
}
else
if(Parameter_UserParam5 < 100)
{
hyterese = 0;
}
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++