Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2672 → Rev 2673

/trunk/jetimenu.c
396,7 → 396,34
}
#endif
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
void Menu_ShowWpInfo(uint8_t key)
{ //0123456789ABCDEF
if(!NaviData_WaypointNumber)
{
JetiBox_printfxy(0,0,"No active");
JetiBox_printfxy(0,1,"Waypoint");
}
else
{
JetiBox_printfxy(0,0,"WP:%2d/%02d",NaviData_WaypointIndex,NaviData_WaypointNumber);
if(NaviData_WaypointNumber)
{
if(NaviData_TargetDistance < 100) JetiBox_printfxy(9,0,"Dst:%2dm ",NaviData_TargetDistance)
else JetiBox_printfxy(9,0,"D:%3dm ",NaviData_TargetDistance);
JetiBox_printfxy(0,1,"%2ds Alt:%2i(%02i)m ",NaviData_TargetHoldTime,(int16_t)(HoehenWert/100),(int16_t)(FromNC_AltitudeSetpoint/100))
}
else
{
JetiBox_printfxy(8,1," ");
}
}
}
#endif
 
 
 
void Menu_WPL_A2(uint8_t key)
{ //0123456789ABCDEF
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
516,23 → 543,24
#if !defined (RECEIVER_SPEKTRUM_DX7EXP) && !defined (RECEIVER_SPEKTRUM_DX8EXP)
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
#define ACC_CAL 13
{8, 1, 0, 0, &Menu_Status }, // 0
{9, 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, 4,10, &Menu_WPL_A1 }, // 4
{4, 6, 5,11, &Menu_WPL_R1 }, // 5
{5, 7, 6,12, &Menu_POINT_LD}, // 6
{6, 8, 7,13, &Menu_POINT_SV}, // 7
{7, 9, 8, 8, &Magnet_Values }, // 8
{8, 0, 9,14, &Menu_AccCal_Ask},// 9
{3, 5, 4, 4, &Menu_ShowWpInfo},// 4
{4, 6, 5,11, &Menu_WPL_A1 }, // 5
{5, 7, 6,12, &Menu_WPL_R1 }, // 6
{6, 8, 7,13, &Menu_POINT_LD}, // 7
{7, 9, 8,14, &Menu_POINT_SV}, // 8
{8,10, 9, 9, &Magnet_Values }, // 9
{9, 0, 9,14, &Menu_AccCal_Ask},// 10
 
{4,10,10,10, &Menu_WPL_A2 }, // 10
{5,11,11,11, &Menu_WPL_R2 }, // 11
{6,12,12,12, &Menu_POINT_LD2}, // 12
{7,13,13,13, &Menu_POINT_SV2}, // 13
{5,11,11,11, &Menu_WPL_A2 }, // 11
{6,12,12,12, &Menu_WPL_R2 }, // 12
{7,13,13,13, &Menu_POINT_LD2}, // 13
{8,14,14,14, &Menu_POINT_SV2}, // 14
 
{14,14,14,14, &Menu_AccCal}, // 14
{15,15,15,15, &Menu_AccCal}, // 15
#else
{6, 1, 0, 0, &Menu_Status }, // 0
{0, 2, 1, 1, &Menu_Temperature }, // 1
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/makefile
6,7 → 6,7
#-------------------------------------------------------------------
VERSION_MAJOR = 2
VERSION_MINOR = 15
VERSION_PATCH = 4
VERSION_PATCH = 6
VERSION_SERIAL_MAJOR = 11 # Serial Protocol to KopterTool -> do not change!
VERSION_SERIAL_MINOR = 0 # Serial Protocol
NC_SPI_COMPATIBLE = 83 # Navi-Kompatibilität
/trunk/version.txt
849,7 → 849,7
2.14c
- checking baro-sensor during flight. Report "ERR:Pressure sensor" and disable Altitude control in case of a Problem
 
2.15e (1.8.2016 -> Patch)
2.14e (1.8.2016 -> Patch)
- REDUNDANT_SLAVE: small Bugfix -> sometimes "SL23: Motor Restart" before liftoff
2.15a
878,6 → 878,9
- do not accept a calibration if the zero-values have > 0,3% error compared to the ACC-Calibration
- \n\r replaced by \r\n
 
2.15h (26.09.2016)
- Waypoint Info in Jeti telemetry
 
toDo:
- CalAthmospheare nachführen