WebSVN - FlightCtrl - Diff - Rev 1378 and 1550 - /branches/V0.78g

 // + porting the sources to other systems or using the software on other systems (except hardware from www.mikrokopter.de) is not allowed
 // + see the File "License.txt" for further Informations
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #include "main.h"
-unsigned int  TestInt = 0;
-#define ARRAYGROESSE 10
 unsigned char Array[ARRAYGROESSE] = {1,2,3,4,5,6,7,8,9,10};
 char DisplayBuff[80] = "Hallo Welt";
 unsigned char DispPtr = 0;
-unsigned char MaxMenue = 14;
+unsigned char MaxMenue = 16;
 unsigned char MenuePunkt = 0;
 unsigned char RemoteKeys = 0;
+{
  unsigned char i;
  for(i=0;i<80;i++) DisplayBuff[i] = ' ';
+}
+void Menu_Putchar(char c)
+{
+        DisplayBuff[DispPtr++] = c;
+}
 void Menu(void)
- {
-  if(MenuePunkt > MaxMenue) MenuePunkt = MaxMenue;
+ {
   if(RemoteKeys & KEY1) { if(MenuePunkt) MenuePunkt--; else MenuePunkt = MaxMenue;}
   if(RemoteKeys & KEY2) { if(MenuePunkt == MaxMenue) MenuePunkt = 0; else MenuePunkt++;}
   if((RemoteKeys & KEY1) && (RemoteKeys & KEY2)) MenuePunkt = 0;
   LcdClear();
            LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",PlatinenVersion/10,PlatinenVersion%10, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH +'a');
            LCD_printfxy(0,2,"Setting:%d %s",GetActiveParamSetNumber(),Mixer.Name);
            if(I2CTimeout < 6) LCD_printfxy(0,3,"I2C ERROR!!!")
                    else
            if(MissingMotor) LCD_printfxy(0,3,"Missing BL-Ctrl:%d!!",MissingMotor)
-           else LCD_printfxy(0,3,"(c) Holger Buss");
-//           if(RemoteTasten & KEY3) TestInt--;
-//           if(RemoteTasten & KEY4) TestInt++;
            break;
     case 1:
           if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG)
+           {
-           LCD_printfxy(0,0,"Hoehe:     %5i",(int)(HoehenWert/5));
+           LCD_printfxy(0,0,"Height:  %5i",(int)(HoehenWert/5));
-           LCD_printfxy(0,1,"SollHoehe: %5i",(int)(SollHoehe/5));
+           LCD_printfxy(0,1,"Setpoint:%5i",(int)(SollHoehe/5));
-           LCD_printfxy(0,2,"Luftdruck: %5i",MessLuftdruck);
+           LCD_printfxy(0,2,"Pressure:%5i",MessLuftdruck);
-           LCD_printfxy(0,3,"Off      : %5i",OCR0A);
+           LCD_printfxy(0,3,"Offset:  %5i",OCR0A);
+           }
            else
+           {
+           LCD_printfxy(0,0,"Height control");
-           LCD_printfxy(0,1,"Keine ");
+           LCD_printfxy(0,1,"DISABLED");
-           LCD_printfxy(0,2,"Höhenregelung");
+           LCD_printfxy(0,2,"Height control");
+           LCD_printfxy(0,3,"DISABLED");
+           }
            break;
     case 2:
-           LCD_printfxy(0,0,"akt. Lage");
+           LCD_printfxy(0,0,"act. bearing");
            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:
            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]);
            break;
     case 5:
            LCD_printfxy(0,0,"Gyro - Sensor");
           if(PlatinenVersion == 10)
+          {
-           LCD_printfxy(0,1,"Nick %4i (%3i.%i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/8, AdNeutralNick%8);
+           LCD_printfxy(0,1,"Nick%4i (%3i.%i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/8, AdNeutralNick%8);
-           LCD_printfxy(0,2,"Roll %4i (%3i.%i)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/8, AdNeutralRoll%8);
+           LCD_printfxy(0,2,"Roll%4i (%3i.%i)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/8, AdNeutralRoll%8);
-           LCD_printfxy(0,3,"Gier %4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier);
+           LCD_printfxy(0,3,"Gier%4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier);
+          }
           else
           if((PlatinenVersion == 11) || (PlatinenVersion == 20))
+          {
            LCD_printfxy(0,1,"Nick %4i (%3i.%x)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16, (AdNeutralNick%16)/2);
            LCD_printfxy(0,2,"Roll %4i (%3i.%x)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16, (AdNeutralRoll%16)/2);
-           LCD_printfxy(0,3,"Gier %4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2);
+           LCD_printfxy(0,3,"Yaw  %4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2);
+          }
           else
           if(PlatinenVersion == 13)
+          {
            LCD_printfxy(0,1,"Nick %4i (%3i)(%3i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16,AnalogOffsetNick);
            LCD_printfxy(0,2,"Roll %4i (%3i)(%3i)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16,AnalogOffsetRoll);
-           LCD_printfxy(0,3,"Gier %4i (%3i)(%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2,AnalogOffsetGier);
+           LCD_printfxy(0,3,"Yaw  %4i (%3i)(%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2,AnalogOffsetGier);
+          }
            break;
     case 6:
            LCD_printfxy(0,0,"ACC - Sensor");
            LCD_printfxy(0,1,"Nick %4i (%3i)",AdWertAccNick,NeutralAccX);
            LCD_printfxy(0,2,"Roll %4i (%3i)",AdWertAccRoll,NeutralAccY);
-           LCD_printfxy(0,3,"Hoch %4i (%3i)",Mittelwert_AccHoch/*accumulate_AccHoch / messanzahl_AccHoch*/,(int)NeutralAccZ);
+           LCD_printfxy(0,3,"Z    %4i (%3i)",Mittelwert_AccHoch/*accumulate_AccHoch / messanzahl_AccHoch*/,(int)NeutralAccZ);
            break;
     case 7:
-           LCD_printfxy(0,1,"Voltage:   %5i",UBat);
+                        LCD_printfxy(0,0,"Voltage:   %3i.%1iV",UBat/10, UBat%10);
+                        LCD_printfxy(0,1,"Current:   %3i.%1iA",Capacity.ActualCurrent/10, Capacity.ActualCurrent%10);
-           LCD_printfxy(0,2,"RC-Level:  %5i",SenderOkay);
+                        LCD_printfxy(0,2,"Power:     %4iW",Capacity.ActualPower);
-           LCD_printfxy(0,3,"RC-Channels:%4i",Channels-1);
+                        LCD_printfxy(0,3,"Discharge: %5imAh", Capacity.UsedCapacity);
            break;
     case 8:
-           LCD_printfxy(0,0,"Kompass       ");
+           LCD_printfxy(0,0,"Receiver");
-           LCD_printfxy(0,1,"Richtung:  %5i",KompassRichtung);
+           LCD_printfxy(0,1,"RC-RSSI:    %4i", PPM_in[0]);
-           LCD_printfxy(0,2,"Messwert:  %5i",KompassValue);
+           LCD_printfxy(0,2,"RC-Quality: %4i", SenderOkay);
-           LCD_printfxy(0,3,"Start:     %5i",KompassStartwert);
+           LCD_printfxy(0,3,"RC-Channels:%4i", Channels-1);
            break;
     case 9:
-           LCD_printfxy(0,0,"Poti1:  %3i",Poti1);
+           LCD_printfxy(0,0,"Compass");
-           LCD_printfxy(0,1,"Poti2:  %3i",Poti2);
+           LCD_printfxy(0,1,"Heading:  %5i",KompassRichtung);
-           LCD_printfxy(0,2,"Poti3:  %3i",Poti3);
+           LCD_printfxy(0,2,"Value:    %5i",KompassValue);
-           LCD_printfxy(0,3,"Poti4:  %3i",Poti4);
+           LCD_printfxy(0,3,"Start:    %5i",KompassStartwert);
            break;
     case 10:
+           LCD_printfxy(0,0,"Poti1:  %3i",Poti[0]);
+           LCD_printfxy(0,1,"Poti2:  %3i",Poti[1]);
+           LCD_printfxy(0,2,"Poti3:  %3i",Poti[2]);
+           LCD_printfxy(0,3,"Poti4:  %3i",Poti[3]);
+           break;
+    case 11:
+           LCD_printfxy(0,0,"Poti5:  %3i",Poti[4]);
+           LCD_printfxy(0,1,"Poti6:  %3i",Poti[5]);
+           LCD_printfxy(0,2,"Poti7:  %3i",Poti[6]);
+           LCD_printfxy(0,3,"Poti8:  %3i",Poti[7]);
+           break;
+    case 12:
            LCD_printfxy(0,0,"Servo  " );
            LCD_printfxy(0,1,"Setpoint  %3i",Parameter_ServoNickControl);
-           LCD_printfxy(0,2,"Stellung: %3i",ServoNickValue);
+           LCD_printfxy(0,2,"Position: %3i",ServoNickValue);
            LCD_printfxy(0,3,"Range:%3i-%3i",EE_Parameter.ServoNickMin,EE_Parameter.ServoNickMax);
            break;
-    case 11:
+    case 13:
            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:
+    case 14:
            LCD_printfxy(0,0,"BL-Ctrl Errors " );
-           LCD_printfxy(0,1," %3d  %3d  %3d  %3d ",MotorError[0],MotorError[1],MotorError[2],MotorError[3]);
+                   LCD_printfxy(0,1,"%3d %3d %3d %3d ",Motor[0].State & MOTOR_STATE_ERROR_MASK,Motor[1].State & MOTOR_STATE_ERROR_MASK,Motor[2].State & MOTOR_STATE_ERROR_MASK,Motor[3].State & MOTOR_STATE_ERROR_MASK);
-           LCD_printfxy(0,2," %3d  %3d  %3d  %3d ",MotorError[4],MotorError[5],MotorError[6],MotorError[7]);
+                   LCD_printfxy(0,2,"%3d %3d %3d %3d ",Motor[4].State & MOTOR_STATE_ERROR_MASK,Motor[5].State & MOTOR_STATE_ERROR_MASK,Motor[6].State & MOTOR_STATE_ERROR_MASK,Motor[7].State & MOTOR_STATE_ERROR_MASK);
-           LCD_printfxy(0,3," %3d  %3d  %3d  %3d ",MotorError[8],MotorError[9],MotorError[10],MotorError[11]);
+                   LCD_printfxy(0,3,"%3d %3d %3d %3d ",Motor[8].State & MOTOR_STATE_ERROR_MASK,Motor[9].State & MOTOR_STATE_ERROR_MASK,Motor[10].State & MOTOR_STATE_ERROR_MASK,Motor[11].State & MOTOR_STATE_ERROR_MASK);
            break;
-    case 13:
+    case 15:
            LCD_printfxy(0,0,"BL-Ctrl found " );
-           LCD_printfxy(0,1," %c   %c   %c   %c ",MotorPresent[0] + '-',MotorPresent[1] + '-',MotorPresent[2] + '-',MotorPresent[3] + '-');
+                   LCD_printfxy(0,1," %c   %c   %c   %c ",'-' + 4 * (Motor[0].State>>7),'-' + 5 * (Motor[1].State>>7),'-' + 6 * (Motor[2].State>>7),'-' + 7 * (Motor[3].State>>7));
-           LCD_printfxy(0,2," %c   %c   %c   %c ",MotorPresent[4] + '-',MotorPresent[5] + '-',MotorPresent[6] + '-',MotorPresent[7] + '-');
+                   LCD_printfxy(0,2," %c   %c   %c   %c ",'-' + 8 * (Motor[4].State>>7),'-' + 9 * (Motor[5].State>>7),'-' + 10 * (Motor[6].State>>7),'-' + 11 * (Motor[7].State>>7));
-           LCD_printfxy(0,3," %c   -   -   -",MotorPresent[8] + '-');
+                   LCD_printfxy(0,3," %c   -   -   - ",'-' + 12 * (Motor[8].State>>7));
-                   if(MotorPresent[9]) LCD_printfxy(4,3,"10");
+                   if(Motor[9].State>>7)  LCD_printfxy(4,3,"10");
-                   if(MotorPresent[10]) LCD_printfxy(8,3,"11");
+                   if(Motor[10].State>>7) LCD_printfxy(8,3,"11");
-                   if(MotorPresent[11]) LCD_printfxy(12,3,"12");
+                   if(Motor[11].State>>7) LCD_printfxy(12,3,"12");
            break;
-    case 14:
+    case 16:
            LCD_printfxy(0,0,"Flight-Time  " );
-           LCD_printfxy(0,1,"      %5umin",FlugMinuten);
+           LCD_printfxy(0,1,"Total:%5umin",FlugMinutenGesamt);
-           LCD_printfxy(0,2,"Total:%5umin",FlugMinutenGesamt);
+           LCD_printfxy(0,2,"Act:  %5umin",FlugMinuten);
            LCD_printfxy(13,3,"(reset)");
                    if(RemoteKeys & KEY4)
+             {
                FlugMinuten = 0;
                eeprom_write_byte(&EEPromArray[EEPROM_ADR_MINUTES2],FlugMinuten / 256);
                eeprom_write_byte(&EEPromArray[EEPROM_ADR_MINUTES2+1],FlugMinuten % 256);
                          }
-/*                 if(RemoteKeys & KEY3 && FlugMinuten == 0)
-             {
+           break;
-               FlugMinutenGesamt = 0;
-               eeprom_write_byte(&EEPromArray[EEPROM_ADR_MINUTES],FlugMinutenGesamt / 256);
-               eeprom_write_byte(&EEPromArray[EEPROM_ADR_MINUTES+1],FlugMinutenGesamt % 256);
-                         } */
-           break;
+    default:
-    default: MaxMenue = MenuePunkt - 1;
+           if(MenuePunkt == MaxMenue) MaxMenue--;
-             MenuePunkt = 0;
+           MenuePunkt = 0;
            break;
+    }
     RemoteKeys = 0;
+}

Subversion Repositories FlightCtrl

(root)/branches/V0.78g_WKN-hef/menu.c @ 1550 - Rev 1378 → 1550