WebSVN - FlightCtrl - Diff - Rev 1077 and 1078 - /branches/V0.71h Code Redesign killagreg/menu.c

 #include "fc.h"
 #include "rc.h"
 #include "uart.h"
 #include "printf_P.h"
 #include "analog.h"
 #ifdef USE_KILLAGREG
 #include "mm3.h"
 #endif
 #if (defined (USE_KILLAGREG) || defined (USE_MK3MAG))
 #include "ubx.h"
 #endif
 #include "_Settings.h"
+#if (!defined (USE_KILLAGREG) && !defined (USE_MK3MAG))
+uint8_t MaxMenuItem = 11;
+#else
+#ifdef USE_MK3MAG
+uint8_t MaxMenuItem = 12;
+#endif
-#define ARRAYSIZE 10
+#ifdef USE_KILLAGREG
-uint8_t Array[ARRAYSIZE] = {1,2,3,4,5,6,7,8,9,10};
+uint8_t MaxMenuItem = 14;
-#define DISPLAYBUFFSIZE 80
+#endif
-int8_t DisplayBuff[DISPLAYBUFFSIZE] = "Hello World";
+#endif
-uint8_t DispPtr = 0;
+uint8_t MenuItem = 0;
-uint8_t RemoteButtons = 0;
+uint8_t RemoteKeys = 0;
 #define KEY1    0x01
 #define KEY2    0x02
+#define KEY3    0x04
+#define KEY4    0x08
+#define KEY5    0x10
+#define DISPLAYBUFFSIZE 80
-#define KEY3    0x04
+int8_t DisplayBuff[DISPLAYBUFFSIZE] = "Hello World";
-#define KEY4    0x08
+uint8_t DispPtr = 0;
 #define KEY5    0x10
 /************************************/
 /*        Update Menu on LCD        */
 /************************************/
 // Display with 20 characters in 4 lines
 void LCD_PrintMenu(void)
+{
-  #if (!defined (USE_KILLAGREG) && !defined (USE_MK3MAG))
-  static uint8_t MaxMenuItem = 11;
-  #else
-  #ifdef USE_MK3MAG
-  static uint8_t MaxMenuItem = 12;
-  #endif
-  #ifdef USE_KILLAGREG
-  static uint8_t MaxMenuItem = 14;
-  #endif
-  #endif
-  static uint8_t MenuItem=0;
-  //  if KEY1 is activated goto previous menu item
-  if(RemoteButtons & KEY1)
+        if(RemoteKeys & KEY1)
-  {
+        {
-          if(MenuItem) MenuItem--;
+                if(MenuItem) MenuItem--;
-          else MenuItem = MaxMenuItem;
+                else MenuItem = MaxMenuItem;
-          LCD_Clear();
-          RemotePollDisplayLine = -1;
-  }
+        }
-  // if KEY2 is activated goto next menu item
-  if(RemoteButtons & KEY2)
+        if(RemoteKeys  & KEY2)
-  {
+        {
-          if (MenuItem == MaxMenuItem) MenuItem = 0;
+                if(MenuItem == MaxMenuItem) MenuItem = 0;
-          else MenuItem++;
+                else MenuItem++;
-          LCD_Clear();
-          RemotePollDisplayLine = -1;
-   }
+        }
+        if((RemoteKeys  & KEY1) && (RemoteKeys  & KEY2)) MenuItem = 0;
-  // if KEY1 and KEY2 is activated goto initial menu item
+        LCD_Clear();
-  if((RemoteButtons & KEY1) && (RemoteButtons & KEY2)) MenuItem = 0;
+        if(MenuItem > MaxMenuItem) MenuItem = MaxMenuItem;
-  // print menu item number in the upper right corner
+        // print menu item number in the upper right corner
-  if(MenuItem < 10)
+        if(MenuItem < 10)
-  {
+        {
           LCD_printfxy(17,0,"[%i]",MenuItem);
-  }
+        }
-  else
+        else
-  {
+        {
           LCD_printfxy(16,0,"[%i]",MenuItem);
-  }
+        }
-  switch(MenuItem)
+        switch(MenuItem)
+        {
     case 0:// Version Info Menu Item
            LCD_printfxy(0,0,"+ MikroKopter +");
-           LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR,VERSION_INDEX+'a');
+           LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH+'a');
            LCD_printfxy(0,2,"Setting: %d ", GetActiveParamSet());
            LCD_printfxy(0,3,"(c) Holger Buss");
            break;
     case 1:// Height Control 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  Ya:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_GAS]],PPM_in[ParamSet.ChannelAssignment[CH_YAW]]);
            LCD_printfxy(0,2,"P1:%4i  P2:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_POTI1]],PPM_in[ParamSet.ChannelAssignment[CH_POTI2]]);
            LCD_printfxy(0,3,"P3:%4i  P4:%4i ",PPM_in[ParamSet.ChannelAssignment[CH_POTI3]],PPM_in[ParamSet.ChannelAssignment[CH_POTI4]]);
            break;
-    case 5:// Gyro Sensor Menu Item
+        case 5:// Gyro Sensor Menu Item
            LCD_printfxy(0,0,"Gyro - Sensor");
            switch(BoardRelease)
+           {
                         case 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,"Yaw  %4i (%3i)",AdNeutralYaw  - AdValueGyrYaw , AdNeutralYaw);
                            break;
+                        case 11:
+                        case 12:
-                        case 11:
+                        case 20:
                            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,"Yaw  %4i (%3i)",AdNeutralYaw  - AdValueGyrYaw , AdNeutralYaw/2);
                            break;
-                        case 12:
+                        case 13:
                         default:
                            LCD_printfxy(0,1,"Nick %4i (%3i)(%3i)",AdValueGyrNick - AdNeutralNick, AdNeutralNick/2, AnalogOffsetNick);
                            LCD_printfxy(0,2,"Roll %4i (%3i)(%3i)",AdValueGyrRoll - AdNeutralRoll, AdNeutralRoll/2, AnalogOffsetRoll);
     default: MaxMenuItem = MenuItem - 1;
              MenuItem = 0;
            break;
     }
-        RemoteButtons = 0;
+    RemoteKeys = 0;

Subversion Repositories FlightCtrl

(root)/branches/V0.71h Code Redesign killagreg/menu.c @ 1139 - Rev 1077 → 1078