WebSVN - FlightCtrl - Diff - Rev 690 and 694 - /branches/V0.68d Code Redesign killagreg/menu.c

 #include "fc.h"
 #include "rc.h"
 #include "uart.h"
 #include "printf_P.h"
 #include "analog.h"
+#include "mm3.h"
 #include "_Settings.h"
 uint16_t  TestInt = 0;
 #define ARRAYSIZE 10
 uint8_t Array[ARRAYSIZE] = {1,2,3,4,5,6,7,8,9,10};
 #define DISPLAYBUFFSIZE 80
 int8_t DisplayBuff[DISPLAYBUFFSIZE] = "Hello World";
 /*        Update Menu on LCD        */
 /************************************/
 // Display with 20 characters in 4 lines
 void LCD_PrintMenu(void)
+ {
-  static uint8_t MaxMenuItem = 11, MenuItem=0;
+  static uint8_t MaxMenuItem = 13, MenuItem=0;
   //  if KEY1 is activated goto previous menu item
   if(RemoteButtons & KEY1)
+  {
            LCD_printfxy(0,3,"(c) Holger Buss");
            break;
     case 1:// Hight Control Menu Item
           if(ParamSet.GlobalConfig & CFG_HEIGHT_CONTROL)
+           {
-           LCD_printfxy(0,0,"Hoehe:     %5i",HoehenWert);
+           LCD_printfxy(0,0,"Hight:      %5i",HoehenWert);
-           LCD_printfxy(0,1,"SollHoehe: %5i",SollHoehe);
+           LCD_printfxy(0,1,"Set Point:  %5i",SollHoehe);
-           LCD_printfxy(0,2,"Luftdruck: %5i",MessLuftdruck);
+           LCD_printfxy(0,2,"Air Press.: %5i",MessLuftdruck);
-           LCD_printfxy(0,3,"Off      : %5i",DruckOffsetSetting);
+           LCD_printfxy(0,3,"Offset    : %5i",DruckOffsetSetting);
+           }
            else
+           {
-           LCD_printfxy(0,1,"Keine ");
+           LCD_printfxy(0,1,"No ");
-           LCD_printfxy(0,2,"Höhenregelung");
+           LCD_printfxy(0,2,"Hight Control");
+           }
            break;
     case 2:// Attitude Menu Item
-           LCD_printfxy(0,0,"akt. Lage");
+           LCD_printfxy(0,0,"Attitude");
            LCD_printfxy(0,1,"Nick:      %5i",IntegralNick/1024);
            LCD_printfxy(0,2,"Roll:      %5i",IntegralRoll/1024);
-           LCD_printfxy(0,3,"Kompass:   %5i",KompassValue);
+           LCD_printfxy(0,3,"Compass:   %5i",KompassValue);
            break;
     case 3:// Remote Control Channel Menu Item
-           LCD_printfxy(0,0,"K1:%4i  K2:%4i ",PPM_in[1],PPM_in[2]);
+           LCD_printfxy(0,0,"C1:%4i  C2:%4i ",PPM_in[1],PPM_in[2]);
-           LCD_printfxy(0,1,"K3:%4i  K4:%4i ",PPM_in[3],PPM_in[4]);
+           LCD_printfxy(0,1,"C3:%4i  C4:%4i ",PPM_in[3],PPM_in[4]);
-           LCD_printfxy(0,2,"K5:%4i  K6:%4i ",PPM_in[5],PPM_in[6]);
+           LCD_printfxy(0,2,"C5:%4i  C6:%4i ",PPM_in[5],PPM_in[6]);
-           LCD_printfxy(0,3,"K7:%4i  K8:%4i ",PPM_in[7],PPM_in[8]);
+           LCD_printfxy(0,3,"C7:%4i  C8:%4i ",PPM_in[7],PPM_in[8]);
            break;
     case 4:// Remote Control Mapping Menu Item
            LCD_printfxy(0,0,"Ni:%4i  Ro:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_NICK]],PPM_in[ParamSet.ChannelAssignment[CH_ROLL]]);
            LCD_printfxy(0,1,"Gs:%4i  Gi:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_GAS]],PPM_in[ParamSet.ChannelAssignment[CH_GIER]]);
            LCD_printfxy(0,0,"Gyro - Sensor");
           if(BoardRelease == 10)
+          {
            LCD_printfxy(0,1,"Nick %4i (%3i)",AdValueGyrNick - AdNeutralNick, AdNeutralNick);
            LCD_printfxy(0,2,"Roll %4i (%3i)",AdValueGyrRoll - AdNeutralRoll, AdNeutralRoll);
-           LCD_printfxy(0,3,"Gier %4i (%3i)",MesswertGier, AdNeutralGier);
+           LCD_printfxy(0,3,"Yaw  %4i (%3i)",MesswertGier, AdNeutralGier);
+          }
           else
+          {
            LCD_printfxy(0,1,"Nick %4i (%3i)",AdValueGyrNick - AdNeutralNick, AdNeutralNick/2);
            LCD_printfxy(0,2,"Roll %4i (%3i)",AdValueGyrRoll - AdNeutralRoll, AdNeutralRoll/2);
-           LCD_printfxy(0,3,"Gier %4i (%3i)",MesswertGier, AdNeutralGier/2);
+           LCD_printfxy(0,3,"Yaw  %4i (%3i)",MesswertGier, AdNeutralGier/2);
+          }
            break;
     case 6:// Acceleration Sensor Menu Item
            LCD_printfxy(0,0,"ACC - Sensor");
-           LCD_printfxy(0,1,"Nick %4i (%3i)",AdValueAccNick,NeutralAccX);
+           LCD_printfxy(0,1,"Nick  %4i (%3i)",AdValueAccNick,NeutralAccX);
-           LCD_printfxy(0,2,"Roll %4i (%3i)",AdValueAccRoll,NeutralAccY);
+           LCD_printfxy(0,2,"Roll  %4i (%3i)",AdValueAccRoll,NeutralAccY);
-           LCD_printfxy(0,3,"Hoch %4i (%3i)",Mittelwert_AccHoch/*accumulate_AccHoch / messanzahl_AccHoch*/,(int)NeutralAccZ);
+           LCD_printfxy(0,3,"Hight %4i (%3i)",Mittelwert_AccHoch/*accumulate_AccHoch / messanzahl_AccHoch*/,(int)NeutralAccZ);
            break;
     case 7:// Accumulator Voltage / Remote Control Level
-           LCD_printfxy(0,1,"Spannung:  %5i",UBat);
+           LCD_printfxy(0,1,"Voltage:  %5i",UBat);
-           LCD_printfxy(0,2,"Empf.Pegel:%5i",SenderOkay);
+           LCD_printfxy(0,2,"RC-Level: %5i",SenderOkay);
            break;
     case 8:// Compass Menu Item
-           LCD_printfxy(0,0,"Kompass       ");
+           LCD_printfxy(0,0,"Compass       ");
-           LCD_printfxy(0,1,"Richtung:  %5i",KompassRichtung);
+           LCD_printfxy(0,1,"Direction: %5i",KompassRichtung);
-           LCD_printfxy(0,2,"Messwert:  %5i",KompassValue);
+           LCD_printfxy(0,2,"Reading:   %5i",KompassValue);
            LCD_printfxy(0,3,"Start:     %5i",KompassStartwert);
            break;
     case 9:// Poti Menu Item
            LCD_printfxy(0,0,"Poti1:  %3i",Poti1);
            LCD_printfxy(0,1,"Poti2:  %3i",Poti2);
            LCD_printfxy(0,3,"Poti4:  %3i",Poti4);
            break;
     case 10:// Servo Menu Item
            LCD_printfxy(0,0,"Servo  " );
            LCD_printfxy(0,1,"Setpoint  %3i",Parameter_ServoNickControl);
-           LCD_printfxy(0,2,"Stellung: %3i",ServoValue);
+           LCD_printfxy(0,2,"Position: %3i",ServoValue);
            LCD_printfxy(0,3,"Range:%3i-%3i",ParamSet.ServoNickMin,ParamSet.ServoNickMax);
            break;
     case 11://Extern Control
            LCD_printfxy(0,0,"ExternControl  " );
            LCD_printfxy(0,1,"Ni:%4i  Ro:%4i ",ExternControl.Nick,ExternControl.Roll);
            LCD_printfxy(0,2,"Gs:%4i  Gi:%4i ",ExternControl.Gas,ExternControl.Gier);
            LCD_printfxy(0,3,"Hi:%4i  Cf:%4i ",ExternControl.Hight,ExternControl.Config);
            break;
+   case 12:// MM3 Kompass
+                        LCD_printfxy(0,0,"MM3 Offset");
+                        LCD_printfxy(0,1,"X_Offset:  %3i",MM3_calib.X_off);
+                        LCD_printfxy(0,2,"Y_Offset:  %3i",MM3_calib.Y_off);
+                        LCD_printfxy(0,3,"Z_Offset:  %3i",MM3_calib.Z_off);
+                        break;
+        case 13://MM3 Range
+                        LCD_printfxy(0,0,"MM3 Range");
+                        LCD_printfxy(0,1,"X_Range:  %4i",MM3_calib.X_range);
+                        LCD_printfxy(0,2,"Y_Range:  %4i",MM3_calib.Y_range);
+                        LCD_printfxy(0,3,"Z_Range:  %4i",MM3_calib.Z_range);
+        break;
     default: MaxMenuItem = MenuItem - 1;
              MenuItem = 0;
            break;
+    }
  RemoteButtons = 0;

Subversion Repositories FlightCtrl

(root)/branches/V0.68d Code Redesign killagreg/menu.c - Rev 690 → 694