/trunk/fc.c |
---|
665,6 → 665,7 |
if((FC_StatusFlags3 & FC_STATUS3_REDUNDANCE_AKTIVE) || !(FC_StatusFlags |= FC_STATUS_MOTOR_RUN)) |
{ |
I2CTimeout = 100; |
if(modell_fliegt != 0 && modell_fliegt < 100) modell_fliegt = 100; // ansonsten kann es vorkommen, dass die Master-FC auf Standgas bleibt |
return; // don't send I2C-Data |
} |
} |
/trunk/hottmenu.c |
---|
582,7 → 582,7 |
//--------------------------------------------------------------- |
void HoTT_Menu(void) |
{ |
static unsigned char line, page = 0,show_current = 0,show_mag = 0, show_poti = 0; |
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; |
1065,6 → 1065,24 |
if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page++; line = 0;} |
if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page--; line = 0;}; |
HottKeyboard = 0; |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
// Bedienung per Taster am Sender |
if(Parameter_UserParam5 > 120 && !hyterese) // |
{ |
hyterese = 1; |
if(wp_tmp < NaviData_MaxWpListIndex) |
{ |
wp_tmp++; |
ToNC_Store_SingePoint = wp_tmp; |
changed = 0; |
} |
} |
else |
if(Parameter_UserParam5 < 100) |
{ |
hyterese = 0; |
} |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
break; |
default: line = 0; |
break; |
1126,6 → 1144,25 |
if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page++; line = 0;} |
if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page--; line = 0;}; |
HottKeyboard = 0; |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
// Bedienung per Taster am Sender |
if(Parameter_UserParam5 > 120 && !hyterese) // |
{ |
hyterese = 1; |
if(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 |
---|
48,13 → 48,68 |
#define SPEAK_FOLLWING 51 // ? |
#define SPEAK_STARTING 52 |
// Achtung: wenn > 53 -> JETI_CODE[53] anpassen |
/* |
1 Fehler: Kalibration |
2 Fehler: Empfang |
3 Fehler: Datenbus |
4 Fehler: Navi |
5 Fehler |
6 Fehler: Kompass |
7 Fehler: Sensor |
8 Fehler: GPS |
9 Fehler: Motor |
10 Fehler: Überlastung |
11 Höhe erreicht |
12 Wegpunkt erreicht |
13 Nächster Wegpunkt |
14 Landen |
15 GPS Fix |
16 Unterspannung |
17 GPS Halten |
18 GPS Home |
19 GPS Aus |
20 * Beep |
21 MikroKopter |
22 Kapazität |
23 Carefree aus |
24 Kalibriere |
25 Maximale Entfernung |
26 Maximale Höhe |
27 * Warnung |
28 * Failsafe aktiv |
29 * Failsafe aus |
30 * Redundanz aktiv |
31 * Redundanz aus |
32 * Starte Wegpunkt |
33 * Fehler: Überstrom |
34 * Fehler: Übertemperatur |
35 * Fehler: Failsafe |
36 * Fehler: Redundanz |
37 Zwanzig Meter |
38 MikroKopter aus |
39 Höhe Ein |
40 Höhe Aus |
41 Einhundert meter |
42 * Verbindung hergestellt |
43 * Verbindung unterbrochen |
44 |
45 |
46 Carefree ein |
47 Sinken |
48 Steigen |
49 Halten |
50 GPS ein |
51 Folgen |
52 Starten |
//fehlt: |
//"Warnung" |
//"Failsafe" |
//"ERR:Redundanz ?" |
*/ |
#define MAX_ERR_NUMBER (37+1) |
extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17]; |
extern unsigned int NaviData_TargetDistance; |
/trunk/jeti_ex.c |
---|
60,7 → 60,7 |
0, // SPEAK_SINKING 47 |
0, // SPEAK_RISING 48 |
0, // SPEAK_HOLDING 49 |
'K', // SPEAK_GPS_ON 50 |
'K', // SPEAK_GPS_ON 50 // ? |
0, // SPEAK_FOLLWING 51 |
'C' // SPEAK_STARTING 52 |
}; |
/trunk/jetimenu.c |
---|
258,7 → 258,7 |
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
void Menu_POINT_SV2(uint8_t key) |
{ //0123456789ABCDEF |
static unsigned char load_waypoint_tmp = 1, changed; |
static unsigned char load_waypoint_tmp = 1, changed, hyterese = 1; |
// if(WPL_Name[0] == 0) JetiBox_printfxy(0,0,"Relative WPs ") |
// else JetiBox_printfxy(0,0,"Rel:%s",WPL_Name); |
286,6 → 286,25 |
ToNC_Store_SingePoint = load_waypoint_tmp; |
changed = 0; |
} |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
// Bedienung per Taster am Sender |
if(Parameter_UserParam5 > 120 && !hyterese) // |
{ |
hyterese = 1; |
if(load_waypoint_tmp < NaviData_MaxWpListIndex) |
{ |
load_waypoint_tmp++; |
ToNC_Store_SingePoint = load_waypoint_tmp; |
// SpeakHoTT = SPEAK_MIKROKOPTER; |
changed = 0; |
} |
} |
else |
if(Parameter_UserParam5 < 100) |
{ |
hyterese = 0; |
} |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
} |
} |
#endif |
293,7 → 312,7 |
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
void Menu_POINT_LD2(uint8_t key) |
{ //0123456789ABCDEF |
static unsigned char load_waypoint_tmp = 1, changed; |
static unsigned char load_waypoint_tmp = 1, changed, hyterese = 1; |
// if(WPL_Name[0] == 0) JetiBox_printfxy(0,0,"FIX Waypoints") |
// else JetiBox_printfxy(0,0,"FIX:%s",WPL_Name); |
318,6 → 337,24 |
ToNC_Load_SingePoint = load_waypoint_tmp; |
changed = 0; |
} |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
// Bedienung per Taster am Sender |
if(Parameter_UserParam5 > 120 && !hyterese) // |
{ |
hyterese = 1; |
if(load_waypoint_tmp < NaviData_MaxWpListIndex) |
{ |
load_waypoint_tmp++; |
ToNC_Load_SingePoint = load_waypoint_tmp; |
changed = 0; |
} |
} |
else |
if(Parameter_UserParam5 < 100) |
{ |
hyterese = 0; |
} |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
} |
} |
#endif |
/trunk/libfc1284.a |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/version.txt |
---|
782,6 → 782,14 |
-> minimum 10 seconds active |
- MULTIPLEX servo protocol implemented (12 & 16 Channels) |
2.10b (28.04.2014) |
- small changes for the case of "NC-Communication loss" |
2.10c (11.05.2015) |
- Redundancy Master: If the I2C-Bus was switched off before flight (motors idle runnung), the Master didn't go into 'Fly'-State |
- Auto-Safe: UserParameter5 in Menu "Save single position" |
- Auto-Load: UserParameter5 in Menu "Load single position" |
toDo: |
- CalAthmospheare nachführen |