Subversion Repositories FlightCtrl

Rev

Rev 1687 | Rev 1692 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1687 Rev 1690
Line 39... Line 39...
39 
 
 39 
 
40 
void Menu_Attitude(uint8_t key)
 40 
void Menu_Attitude(uint8_t key)
41 
{                       //0123456789ABCDEF
 41 
{                       //0123456789ABCDEF
42 
//      JetiBox_printfxy(0,0,"Nick Roll  Yaw");
 42 
//      JetiBox_printfxy(0,0,"Nick Roll  Yaw");
43 
//      JetiBox_printfxy(0,1,"%4i %4i %4i", (int16_t)(IntegralNick/1024), (int16_t)(IntegralRoll/1024), (int16_t)(ErsatzKompass / GIER_GRAD_FAKTOR));
 - 
 
44 
if(RequiredMotors <= 4)
 - 
 
45 
 {
 - 
 
46 
  JetiBox_printfxy(0,0,"Temperatures");
 - 
 
47 
  JetiBox_printfxy(0,1,"%3i %3i %3i %3i", Motor[0].Temperature, Motor[1].Temperature, Motor[2].Temperature, Motor[3].Temperature);
 - 
 
48 
 }
 - 
 
49 
else
 - 
 
50 
if(RequiredMotors <= 6)
 - 
 
51 
 {
 - 
 
52 
  JetiBox_printfxy(0,0,"%3i %3i %3i %3i", Motor[0].Temperature, Motor[1].Temperature, Motor[2].Temperature, Motor[3].Temperature);
 - 
 
53 
  JetiBox_printfxy(0,1,"%3i %3i C      ", Motor[4].Temperature, Motor[5].Temperature);
 - 
 
54 
 }
 - 
 
55 
else
 - 
 
56 
 {
 43 
//      JetiBox_printfxy(0,1,"%4i %4i %4i", (int16_t)(IntegralNick/1024), (int16_t)(IntegralRoll/1024), (int16_t)(ErsatzKompass / GIER_GRAD_FAKTOR));
57 
  JetiBox_printfxy(0,0,"%3i %3i %3i %3i", Motor[0].Temperature, Motor[1].Temperature, Motor[2].Temperature, Motor[3].Temperature);
 44 
  JetiBox_printfxy(0,0,"%3i %3i %3i %3i", Motor[0].Temperature, Motor[1].Temperature, Motor[2].Temperature, Motor[3].Temperature);
- 
 
 45 
  JetiBox_printfxy(0,1,"%3i %3i %3i %3i", Motor[4].Temperature, Motor[5].Temperature, Motor[6].Temperature, Motor[7].Temperature);
- 
 
 46 
  if(RequiredMotors <= 4)
- 
 
 47 
        {
- 
 
 48 
         JetiBox_printfxy(0,1,"Temperatures    ");
- 
 
 49 
    }
- 
 
 50 
        else
- 
 
 51 
    if(RequiredMotors <= 6)
- 
 
 52 
        {
58 
  JetiBox_printfxy(0,1,"%3i %3i %3i %3i", Motor[4].Temperature, Motor[5].Temperature, Motor[6].Temperature, Motor[7].Temperature);
 53 
         JetiBox_printfxy(8,1,"\%cC     ",0xdf);
59 
 }
 54 
        }
Line 60... Line 55...
60 
}
 55 
}
61 
 
 56 
 
62 
void Menu_Battery(uint8_t key)
 57 
void Menu_Battery(uint8_t key)
Line 68... Line 63...
68 
 
 63 
 
69 
void Menu_PosInfo(uint8_t key)
 64 
void Menu_PosInfo(uint8_t key)
70 
{
 65 
{
71 
        if(NaviDataOkay)
 66 
        if(NaviDataOkay)
72 
        {
 67 
        {
73 
                JetiBox_printfxy(0,0,"Sat:%02d", GPSInfo.NumOfSats);
 68 
                JetiBox_printfxy(0,0,"%2um/s Sat:%d ",GPSInfo.Speed,GPSInfo.NumOfSats);
74 
                switch (GPSInfo.SatFix)
 69 
                switch (GPSInfo.SatFix)
75 
                {
 - 
 
76 
                        case SATFIX_NONE:
 - 
 
77 
                                JetiBox_printfxy(7,0,"NoFix");
 - 
 
78 
                                break;
 - 
 
79 
                        case SATFIX_2D:
 - 
 
80 
                                JetiBox_printfxy(7,0,"2DFix");
 - 
 
81 
                                break;
 70 
                {
82 
                        case SATFIX_3D:
 71 
                        case SATFIX_3D:
83 
                                JetiBox_printfxy(7,0,"3DFix");
 72 
                                JetiBox_printfxy(12,0,"  3D");
- 
 
 73 
                                break;
- 
 
 74 
 
- 
 
 75 
                        case SATFIX_2D:
84 
                                break;
 76 
                        case SATFIX_NONE:
85 
                        default:
 77 
                        default:
86 
                                JetiBox_printfxy(7,0,"??Fix");
 78 
                                JetiBox_printfxy(12,0,"NoFx");
87 
                                break;
 79 
                                break;
88 
                }
 80 
                }
89 
                if(GPSInfo.Flags & FLAG_DIFFSOLN)
 81 
                if(GPSInfo.Flags & FLAG_DIFFSOLN)
90 
                {
 82 
                {
91 
                        JetiBox_printfxy(9,0,"/DGPS");
 83 
                        JetiBox_printfxy(12,0,"DGPS");
92 
                }
 84 
                }
93 
                JetiBox_printfxy(0,1,"Home:%03dm %03d%c", GPSInfo.HomeDistance/10, GPSInfo.HomeBearing, 0xDF);
 85 
                JetiBox_printfxy(0,1,"Home:%3dm %3d%c", GPSInfo.HomeDistance/10, GPSInfo.HomeBearing, 0xDF);
94 
        }
 86 
        }
95 
        else
 87 
        else
96 
        {                     //0123456789ABCDEF
 88 
        {                     //0123456789ABCDEF
97 
                JetiBox_printfxy(2,0,"No NaviCtrl!");
 89 
                JetiBox_printfxy(2,0,"No NaviCtrl!");