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 |