/trunk/fc.c |
---|
1374,8 → 1374,8 |
Mess_IntegralNick -= tmp_long; |
Mess_IntegralRoll -= tmp_long2; |
DebugOut.Analog[16] += tmp_long; |
DebugOut.Analog[17] += tmp_long2; |
//DebugOut.Analog[16] += tmp_long; |
//DebugOut.Analog[17] += tmp_long2; |
} |
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
1569,12 → 1569,15 |
fehler = ((540 + KompassValue - ErsatzKompassInGrad) % 360) - 180; |
// GIER_GRAD_FAKTOR ist ca. 1200 |
// Kompasswert einloggen |
if(NeueKompassRichtungMerken) KompassSollWert = ErsatzKompassInGrad; |
if(KompassSignalSchlecht) KompassSignalSchlecht--; |
else |
if(w < 25) |
{ |
GierGyroFehler += fehler; |
if(NeueKompassRichtungMerken) |
if(NeueKompassRichtungMerken) NeueKompassRichtungMerken--; |
/* if(NeueKompassRichtungMerken) |
{ |
if(--NeueKompassRichtungMerken == 0) |
{ |
1581,6 → 1584,7 |
KompassSollWert = ErsatzKompassInGrad; |
} |
} |
*/ |
} |
// Kompass fusionieren |
if(!KompassSignalSchlecht) ErsatzKompass += (fehler * KompassFusion) / korrektur; |
/trunk/hottmenu.c |
---|
968,9 → 968,11 |
} |
else |
{ |
HoTT_printfxy(13,6," --") |
HoTT_printfxy(13,6,"--") |
} |
if(GPSInfo.SatFix == SATFIX_3D) |
{ |
if(NaviData_MaxWpListIndex == 0) HoTT_printfxy(0,7,"No SD-Card ") |
else |
{ |
977,9 → 979,12 |
if(changed && wp_tmp) HoTT_printfxy(0,7,"(Set -> Store)") |
else Hott_ClearLine(7); |
} |
if(HottKeyboard == HOTT_KEY_SET) { if(wp_tmp) ToNC_Store_SingePoint = wp_tmp; changed = 0;} |
} |
else HoTT_printfxy(0,7,"!No GPS-Fix! "); |
if(HottKeyboard == HOTT_KEY_UP && wp_tmp < NaviData_MaxWpListIndex) { changed = 1; wp_tmp++; HoTTBlink = 0;} |
if(HottKeyboard == HOTT_KEY_DOWN && wp_tmp > 1) { changed = 1; wp_tmp--; HoTTBlink = 0;}; |
if(HottKeyboard == HOTT_KEY_SET) { if(wp_tmp) ToNC_Store_SingePoint = wp_tmp; changed = 0;} |
if(HottKeyboard == HOTT_KEY_LEFT) { LIBFC_HoTT_Clear(); page++; line = 0;} |
if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page--; line = 0;}; |
HottKeyboard = 0; |
1000,13 → 1005,17 |
HoTT_printfxy(0,2," %2i.%1iV ",UBat/10, UBat%10) |
HoTT_printfxy(0,3," %2i:%02i ",FlugSekunden/60,FlugSekunden%60); |
// HoTT_printfxy(0,4,"Dist:%3dm",NaviData_TargetDistance) |
if(NaviData_WaypointNumber) HoTT_printfxy(0,5,"Active WP:%2d/%d %dm ",NaviData_WaypointIndex,NaviData_WaypointNumber,NaviData_TargetDistance) |
if(NaviData_WaypointNumber) HoTT_printfxy(0,5,"WP:%2d/%d Dist:%3dm ",NaviData_WaypointIndex,NaviData_WaypointNumber,NaviData_TargetDistance) |
else Hott_ClearLine(5); |
break; |
case 2: |
HoTT_printfxy(11,2,"ALT:%4im", (int16_t)(HoehenWert/100)) |
HoTT_printfxy(11,3,"DIR: %3d%c",CompassCorrected, HoTT_GRAD); |
HoTT_printfxy(11,4,"Cam: %3i",Parameter_ServoNickControl); |
if(FromNC_AltitudeSpeed) |
HoTT_printfxy(8,2,"ALT:%4i/%im ", (int16_t)(HoehenWert/100),(int16_t)(FromNC_AltitudeSetpoint/100)) |
else |
HoTT_printfxy(8,2,"ALT:%4im ",(int16_t)(HoehenWert/100)) |
HoTT_printfxy(8,3,"DIR: %3d%c",CompassCorrected, HoTT_GRAD); |
HoTT_printfxy(8,4,"Cam: %3i",Parameter_ServoNickControl); |
break; |
// HoTT_printfxy(11,7,"%s",WPL_Name) |
case 3: |
1028,7 → 1037,11 |
else |
{ |
if(changed && wp_tmp) HoTT_printfxy(0,7,"(Set -> Load)") |
else Hott_ClearLine(7); |
else |
{ |
Hott_ClearLine(7); |
if(NaviData_WaypointNumber) HoTT_printfxy(0,7,"%s",WPL_Name); |
} |
} |
if(HottKeyboard == HOTT_KEY_UP && wp_tmp < NaviData_MaxWpListIndex) { changed = 1; wp_tmp++; HoTTBlink = 0;} |
if(HottKeyboard == HOTT_KEY_DOWN && wp_tmp > 1) { changed = 1; wp_tmp--; HoTTBlink = 0;}; |
/trunk/jetimenu.c |
---|
175,6 → 175,90 |
#endif |
} |
void Menu_POINT_LD(uint8_t key) |
{ //0123456789ABCDEF |
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP) |
JetiBox_printfxy(0,0,"Load singl.Point"); |
// JetiBox_printfxy(0,1,"(Fixed) "); |
#endif |
} |
void Menu_POINT_SV(uint8_t key) |
{ //0123456789ABCDEF |
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP) |
JetiBox_printfxy(0,0,"Save singl.Point"); |
// JetiBox_printfxy(0,1,"(Relative) "); |
#endif |
} |
void Menu_POINT_SV2(uint8_t key) |
{ //0123456789ABCDEF |
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP) |
static unsigned char load_waypoint_tmp = 1, changed; |
// 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:"); |
if(NaviData_MaxWpListIndex == 0) JetiBox_printfxy(0,1,"no SD-Card") |
else |
if(GPSInfo.SatFix != SATFIX_3D) JetiBox_printfxy(0,1,"no GPS-Fix") |
else |
{ |
JetiBox_printfxy(11,0,"%2d",load_waypoint_tmp); |
// if(NaviData_WaypointNumber) JetiBox_printfxy(8,1,"%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber) |
// else JetiBox_printfxy(8,1,"--/--") |
JetiBox_printfxy(0,1,"Dir:%3d Alt:%3dm",CompassCorrected,(int16_t)(HoehenWert/100)) |
if(changed) JetiBox_printfxy(14,0,"->") |
else JetiBox_printfxy(14,0," "); |
if(key == JETIBOX_KEY_UP && load_waypoint_tmp < NaviData_MaxWpListIndex) { load_waypoint_tmp++; changed = 1;} |
if(key == JETIBOX_KEY_DOWN && load_waypoint_tmp > 1) { load_waypoint_tmp--; changed = 1; } |
if(key == JETIBOX_KEY_RIGHT && load_waypoint_tmp) |
{ |
ToNC_Store_SingePoint = load_waypoint_tmp; |
changed = 0; |
} |
} |
#endif |
} |
void Menu_POINT_LD2(uint8_t key) |
{ //0123456789ABCDEF |
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP) |
static unsigned char load_waypoint_tmp = 1, changed; |
// 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") |
if(NaviData_MaxWpListIndex == 0) JetiBox_printfxy(0,1,"no SD-Card") |
else |
{ |
JetiBox_printfxy(11,0,"%2d",load_waypoint_tmp); |
if(NaviData_WaypointNumber) JetiBox_printfxy(0,1,"Dist:%3d Alt:%3d ",NaviData_TargetDistance,(int16_t)(FromNC_AltitudeSetpoint/100)) |
else JetiBox_printfxy(8,1," "); |
if(changed) JetiBox_printfxy(14,0,"->") |
else JetiBox_printfxy(14,0," "); |
if(key == JETIBOX_KEY_UP && load_waypoint_tmp < NaviData_MaxWpListIndex) { load_waypoint_tmp++; changed = 1;} |
if(key == JETIBOX_KEY_DOWN && load_waypoint_tmp > 1) { load_waypoint_tmp--; changed = 1; } |
if(key == JETIBOX_KEY_RIGHT && load_waypoint_tmp) |
{ |
ToNC_Load_SingePoint = load_waypoint_tmp; |
changed = 0; |
} |
} |
#endif |
} |
void Menu_WPL_A2(uint8_t key) |
{ //0123456789ABCDEF |
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP) |
292,16 → 376,20 |
const MENU_ENTRY JetiBox_Menu[] PROGMEM= |
{ // l r u d pHandler |
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP) |
{6, 1, 0, 0, &Menu_Status }, // 0 |
{8, 1, 0, 0, &Menu_Status }, // 0 |
{0, 2, 1, 1, &Menu_Temperature }, // 1 |
{1, 3, 2, 2, &Menu_Battery }, // 2 |
{2, 4, 3, 3, &Menu_PosInfo }, // 3 |
{3, 5, 7, 7, &Menu_WPL_A1 }, // 4 |
{4, 6, 8, 8, &Menu_WPL_R1 }, // 5 |
{5, 0, 6, 6, &Magnet_Values }, // 6 |
{3, 5, 4, 9, &Menu_WPL_A1 }, // 4 |
{4, 6, 5,10, &Menu_WPL_R1 }, // 5 |
{5, 7, 6,11, &Menu_POINT_LD}, // 6 |
{6, 8, 7,12, &Menu_POINT_SV}, // 7 |
{7, 0, 8, 6, &Magnet_Values }, // 8 |
{4, 7, 7, 7, &Menu_WPL_A2 }, // 7 |
{5, 8, 8, 8, &Menu_WPL_R2 }, // 8 |
{4, 9, 9, 9, &Menu_WPL_A2 }, // 9 |
{5,10,10,10, &Menu_WPL_R2 }, // 10 |
{6,11,11,11, &Menu_POINT_LD2}, // 11 |
{7,12,12,12, &Menu_POINT_SV2}, // 12 |
#endif |
}; |
/trunk/libfc1284.a |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/trunk/main.c |
---|
305,14 → 305,12 |
DebugOut.Status[0] = 0x01 | 0x02; |
JetiBeep = 0; |
if(EE_Parameter.ExtraConfig & CFG_NO_RCOFF_BEEPING) DisableRcOffBeeping = 1; |
EEAR = EE_DUMMY; // Set the EEPROM Address pointer to an unused space |
while(1) |
{ |
EEAR = EE_DUMMY; // Set the EEPROM Address pointer to an unused space |
if(ReceiverUpdateModeActive) while (1) PORTC &= ~(1<<7); // Beeper off |
//GRN_ON; |
if(UpdateMotor && AdReady) // ReglerIntervall |
{ |
//GRN_OFF; |
cli(); |
UpdateMotor--; |
sei(); |
456,8 → 454,6 |
BeepMuster = 0x0300; |
} |
} |
// SendSPI = SPI_BYTEGAP; |
EEAR = EE_DUMMY; // Set the EEPROM Address pointer to an unused space |
// +++++++++++++++++++++++++++++++++ |
// Sekundentakt |
if(++second == 49) |
/trunk/spi.c |
---|
227,6 → 227,7 |
ToNC_Load_WP_List = 0; |
ToNC_Load_SingePoint = 0; |
ToNC_Store_SingePoint = 0; |
ToNaviCtrl.Param.sInt[4] = KompassSollWert; // Pos. 8 & 9 |
break; |
case SPI_FCCMD_STICK: |
cli(); |
/trunk/version.txt |
---|
693,6 → 693,8 |
2.04c |
- S.Bus auf 16 Kanäle erweitert |
2.05c |
- Load/Store Single Point |
ToDo: Höhenauslösung |