WebSVN - FlightCtrl - Diff - Rev 130 and 243 - /branches/GPS_BETA_chris2798

  for(i=0;i<80;i++) DisplayBuff[i] = ' ';
+}
 void Menu(void)
  {
-  static unsigned char MaxMenue = 10,MenuePunkt=0;
+  static unsigned char MaxMenue = 12,MenuePunkt=0;
   if(RemoteTasten & KEY1) { if(MenuePunkt) MenuePunkt--; else MenuePunkt = MaxMenue; LcdClear(); }
   if(RemoteTasten & KEY2) { MenuePunkt++; LcdClear(); }
   if((RemoteTasten & KEY1) && (RemoteTasten & KEY2)) MenuePunkt = 0;
   LCD_printfxy(17,0,"[%i]",MenuePunkt);
+  switch(MenuePunkt)
+   {
+   case 0:
+           LCD_printfxy(0,0,"GPS Modification");
+           LCD_printfxy(0,1,"based on V0.64 , GPS V0.74");
+           LCD_printfxy(0,2,"(c) Hartmann");
+           LCD_printfxy(0,3,"Schmitz");
+           break;
-  switch(MenuePunkt)
-    case 0:
+    case 1:
            LCD_printfxy(0,0,"++ MikroKopter ++");
-           LCD_printfxy(0,1,"V%d.%d",VERSION_HAUPTVERSION, VERSION_NEBENVERSION);
+           LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d",PlatinenVersion/10,PlatinenVersion%10,VERSION_HAUPTVERSION, VERSION_NEBENVERSION);
            LCD_printfxy(0,2,"Setting: %d ",GetActiveParamSetNumber());
            LCD_printfxy(0,3,"(c) Holger Buss");
 //           if(RemoteTasten & KEY3) TestInt--;
+//           if(RemoteTasten & KEY4) TestInt++;
+           break;
+        case 2:
+          if(EE_Parameter.GlobalConfig & CFG_GPS_AKTIV){
+           if(actualPos.state == 2){
+           LCD_printfxy(0,0,"2D-Fix");
+           LCD_printfxy(0,1,"Koordinaten:");
+           LCD_printfxy(0,2,"Nord: %5i",actualPos.northing);
+           LCD_printfxy(0,3,"Nord: %5i",actualPos.easting);
+           }
+                   else if (actualPos.state ==3){
+                   LCD_printfxy(0,0,"3D-Fix");
+           LCD_printfxy(0,1,"Koordinaten:");
+           LCD_printfxy(0,2,"Nord: %5i",actualPos.northing);
+           LCD_printfxy(0,3,"Nord: %5i",actualPos.easting);}
+           else
+           {
+           LCD_printfxy(0,1,"Kein ");
+           LCD_printfxy(0,2,"Empfang");
+           }}
+           else{
+                   LCD_printfxy(0,1,"GPS ");
+           LCD_printfxy(0,2,"deaktiviert");}
+           break;
-//           if(RemoteTasten & KEY4) TestInt++;
            break;
-    case 1:
+    case 3:
           if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG)
+           {
            LCD_printfxy(0,0,"Hoehe:     %5i",HoehenWert);
            LCD_printfxy(0,1,"Keine ");
            LCD_printfxy(0,2,"Höhenregelung");
+           }
            break;
-    case 2:
+    case 4:
            LCD_printfxy(0,0,"akt. Lage");
            LCD_printfxy(0,1,"Nick:      %5i",IntegralNick/1024);
            LCD_printfxy(0,2,"Roll:      %5i",IntegralRoll/1024);
            LCD_printfxy(0,3,"Kompass:   %5i",KompassValue);
            break;
-    case 3:
+    case 5:
            LCD_printfxy(0,0,"K1:%4i  K2:%4i ",PPM_in[1],PPM_in[2]);
            LCD_printfxy(0,1,"K3:%4i  K4:%4i ",PPM_in[3],PPM_in[4]);
            LCD_printfxy(0,2,"K5:%4i  K6:%4i ",PPM_in[5],PPM_in[6]);
-           LCD_printfxy(0,3,"K7:%4i  Kanäle ",PPM_in[7]);
+           LCD_printfxy(0,3,"K7:%4i  K8:%4i ",PPM_in[7],PPM_in[8]);
            break;
-    case 4:
+    case 6:
            LCD_printfxy(0,0,"Ni:%4i  Ro:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_NICK]],PPM_in[EE_Parameter.Kanalbelegung[K_ROLL]]);
            LCD_printfxy(0,1,"Gs:%4i  Gi:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_GAS]],PPM_in[EE_Parameter.Kanalbelegung[K_GIER]]);
            LCD_printfxy(0,2,"P1:%4i  P2:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI1]],PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]]);
-           LCD_printfxy(0,3,"P3:%4i  Kanäle ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]]);
+           LCD_printfxy(0,3,"P3:%4i  P4:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]],PPM_in[EE_Parameter.Kanalbelegung[K_POTI4]]);
            break;
-    case 5:
+    case 7:
            LCD_printfxy(0,0,"Gyro - Sensor");
            LCD_printfxy(0,1,"Nick %4i (%3i)",AccumulateNick / MessanzahlNick, AdNeutralNick);
            LCD_printfxy(0,2,"Roll %4i (%3i)",AccumulateRoll / MessanzahlRoll, AdNeutralRoll);
            LCD_printfxy(0,3,"Gier %4i (%3i)",AccumulateGier / MessanzahlGier, AdNeutralGier);
            break;
-    case 6:
+    case 8:
            LCD_printfxy(0,0,"ACC - Sensor");
            LCD_printfxy(0,1,"Nick %4i (%3i)",accumulate_AccNick / messanzahl_AccNick,NeutralAccX);
            LCD_printfxy(0,2,"Roll %4i (%3i)",accumulate_AccRoll / messanzahl_AccRoll,NeutralAccY);
            LCD_printfxy(0,3,"Hoch %4i (%3i)",Aktuell_az/*accumulate_AccHoch / messanzahl_AccHoch*/,(int)NeutralAccZ);
            break;
-    case 7:
+    case 9:
            LCD_printfxy(0,1,"Spannung:  %5i",UBat);
            LCD_printfxy(0,2,"Empf.Pegel:%5i",SenderOkay);
            break;
-    case 8:
+    case 10:
            LCD_printfxy(0,0,"Kompass       ");
            LCD_printfxy(0,1,"Richtung:  %5i",KompassRichtung);
            LCD_printfxy(0,2,"Messwert:  %5i",KompassValue);
            LCD_printfxy(0,3,"Start:     %5i",KompassStartwert);
            break;
-    case 9:
+    case 11:
            LCD_printfxy(0,0,"Poti1:  %3i",Poti1);
            LCD_printfxy(0,1,"Poti2:  %3i",Poti2);
            LCD_printfxy(0,2,"Poti3:  %3i",Poti3);
            LCD_printfxy(0,3,"Poti4:  %3i",Poti4);
-           break;
+         break;
-    case 10:
+    case 12:
            LCD_printfxy(0,0,"Servo  " );
            LCD_printfxy(0,1,"Setpoint  %3i",Parameter_ServoNickControl);
            LCD_printfxy(0,2,"Stellung: %3i",ServoValue);
            LCD_printfxy(0,3,"Range:%3i-%3i",EE_Parameter.ServoNickMin,EE_Parameter.ServoNickMax);

Subversion Repositories FlightCtrl

(root)/branches/GPS_BETA_chris2798_hallo2/menu.c @ 938 - Rev 130 → 243