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



// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 
 
#include <inttypes.h>
#include "main.h"
#include "eeprom.h"
#include "timer2.h"
#include "fc.h"
#include "rc.h"

  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_HAUPTVERSION, VERSION_NEBENVERSION,VERSION_INDEX+'a');
           LCD_printfxy(0,2,"Setting: %d ", GetActiveParamSet());
           LCD_printfxy(0,3,"(c) Holger Buss");
           break;
    case 1:// Hight Control Menu Item
          if(ParamSet.GlobalConfig & CFG_HOEHENREGELUNG)
           {
           LCD_printfxy(0,0,"Hoehe:     %5i",HoehenWert);
           LCD_printfxy(0,1,"SollHoehe: %5i",SollHoehe);
           LCD_printfxy(0,2,"Luftdruck: %5i",MessLuftdruck);
           LCD_printfxy(0,3,"Off      : %5i",DruckOffsetSetting);

           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  K8:%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.Kanalbelegung[K_NICK]],PPM_in[ParamSet.Kanalbelegung[K_ROLL]]);
           LCD_printfxy(0,1,"Gs:%4i  Gi:%4i ",PPM_in[ParamSet.Kanalbelegung[K_GAS]],PPM_in[ParamSet.Kanalbelegung[K_GIER]]);
           LCD_printfxy(0,2,"P1:%4i  P2:%4i ",PPM_in[ParamSet.Kanalbelegung[K_POTI1]],PPM_in[ParamSet.Kanalbelegung[K_POTI2]]);
           LCD_printfxy(0,3,"P3:%4i  P4:%4i ",PPM_in[ParamSet.Kanalbelegung[K_POTI3]],PPM_in[ParamSet.Kanalbelegung[K_POTI4]]);
           break;
    case 5:// Gyro Sensor Menu Item
           LCD_printfxy(0,0,"Gyro - Sensor");
          if(BoardRelease == 10)
          {

           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,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);

Rev 685	Rev 687
Line 6...	Line 6...
6	// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++	6	// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Line 7...	Line 7...
7		7
8		8
-		9	#include <inttypes.h>
9	#include <inttypes.h>	10	#include "main.h"
10	#include "main.h"	11	#include "eeprom.h"
11	#include "timer2.h"	12	#include "timer2.h"
12	#include "fc.h"	13	#include "fc.h"
13	#include "rc.h"	14	#include "rc.h"
Line 81...	Line 82...
81	switch(MenuItem)	82	switch(MenuItem)
82	{	83	{
83	case 0:// Version Info Menu Item	84	case 0:// Version Info Menu Item
84	LCD_printfxy(0,0,"+ MikroKopter +");	85	LCD_printfxy(0,0,"+ MikroKopter +");
85	LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_HAUPTVERSION, VERSION_NEBENVERSION,VERSION_INDEX+'a');	86	LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",BoardRelease/10,BoardRelease%10,VERSION_HAUPTVERSION, VERSION_NEBENVERSION,VERSION_INDEX+'a');
86	LCD_printfxy(0,2,"Setting: %d ", GetActiveParamSetNumber());	87	LCD_printfxy(0,2,"Setting: %d ", GetActiveParamSet());
87	LCD_printfxy(0,3,"(c) Holger Buss");	88	LCD_printfxy(0,3,"(c) Holger Buss");
88	break;	89	break;
89	case 1:// Hight Control Menu Item	90	case 1:// Hight Control Menu Item
90	if(EE_Parameter.GlobalConfig & CFG_HOEHENREGELUNG)	91	if(ParamSet.GlobalConfig & CFG_HOEHENREGELUNG)
91	{	92	{
92	LCD_printfxy(0,0,"Hoehe: %5i",HoehenWert);	93	LCD_printfxy(0,0,"Hoehe: %5i",HoehenWert);
93	LCD_printfxy(0,1,"SollHoehe: %5i",SollHoehe);	94	LCD_printfxy(0,1,"SollHoehe: %5i",SollHoehe);
94	LCD_printfxy(0,2,"Luftdruck: %5i",MessLuftdruck);	95	LCD_printfxy(0,2,"Luftdruck: %5i",MessLuftdruck);
95	LCD_printfxy(0,3,"Off : %5i",DruckOffsetSetting);	96	LCD_printfxy(0,3,"Off : %5i",DruckOffsetSetting);
Line 112...	Line 113...
112	LCD_printfxy(0,1,"K3:%4i K4:%4i ",PPM_in[3],PPM_in[4]);	113	LCD_printfxy(0,1,"K3:%4i K4:%4i ",PPM_in[3],PPM_in[4]);
113	LCD_printfxy(0,2,"K5:%4i K6:%4i ",PPM_in[5],PPM_in[6]);	114	LCD_printfxy(0,2,"K5:%4i K6:%4i ",PPM_in[5],PPM_in[6]);
114	LCD_printfxy(0,3,"K7:%4i K8:%4i ",PPM_in[7],PPM_in[8]);	115	LCD_printfxy(0,3,"K7:%4i K8:%4i ",PPM_in[7],PPM_in[8]);
115	break;	116	break;
116	case 4:// Remote Control Mapping Menu Item	117	case 4:// Remote Control Mapping Menu Item
117	LCD_printfxy(0,0,"Ni:%4i Ro:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_NICK]],PPM_in[EE_Parameter.Kanalbelegung[K_ROLL]]);	118	LCD_printfxy(0,0,"Ni:%4i Ro:%4i ",PPM_in[ParamSet.Kanalbelegung[K_NICK]],PPM_in[ParamSet.Kanalbelegung[K_ROLL]]);
118	LCD_printfxy(0,1,"Gs:%4i Gi:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_GAS]],PPM_in[EE_Parameter.Kanalbelegung[K_GIER]]);	119	LCD_printfxy(0,1,"Gs:%4i Gi:%4i ",PPM_in[ParamSet.Kanalbelegung[K_GAS]],PPM_in[ParamSet.Kanalbelegung[K_GIER]]);
119	LCD_printfxy(0,2,"P1:%4i P2:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI1]],PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]]);	120	LCD_printfxy(0,2,"P1:%4i P2:%4i ",PPM_in[ParamSet.Kanalbelegung[K_POTI1]],PPM_in[ParamSet.Kanalbelegung[K_POTI2]]);
120	LCD_printfxy(0,3,"P3:%4i P4:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]],PPM_in[EE_Parameter.Kanalbelegung[K_POTI4]]);	121	LCD_printfxy(0,3,"P3:%4i P4:%4i ",PPM_in[ParamSet.Kanalbelegung[K_POTI3]],PPM_in[ParamSet.Kanalbelegung[K_POTI4]]);
121	break;	122	break;
122	case 5:// Gyro Sensor Menu Item	123	case 5:// Gyro Sensor Menu Item
123	LCD_printfxy(0,0,"Gyro - Sensor");	124	LCD_printfxy(0,0,"Gyro - Sensor");
124	if(BoardRelease == 10)	125	if(BoardRelease == 10)
125	{	126	{
Line 158...	Line 159...
158	break;	159	break;
159	case 10:// Servo Menu Item	160	case 10:// Servo Menu Item
160	LCD_printfxy(0,0,"Servo " );	161	LCD_printfxy(0,0,"Servo " );
161	LCD_printfxy(0,1,"Setpoint %3i",Parameter_ServoNickControl);	162	LCD_printfxy(0,1,"Setpoint %3i",Parameter_ServoNickControl);
162	LCD_printfxy(0,2,"Stellung: %3i",ServoValue);	163	LCD_printfxy(0,2,"Stellung: %3i",ServoValue);
163	LCD_printfxy(0,3,"Range:%3i-%3i",EE_Parameter.ServoNickMin,EE_Parameter.ServoNickMax);	164	LCD_printfxy(0,3,"Range:%3i-%3i",ParamSet.ServoNickMin,ParamSet.ServoNickMax);
164	break;	165	break;
165	case 11://Extern Control	166	case 11://Extern Control
166	LCD_printfxy(0,0,"ExternControl " );	167	LCD_printfxy(0,0,"ExternControl " );
167	LCD_printfxy(0,1,"Ni:%4i Ro:%4i ",ExternControl.Nick,ExternControl.Roll);	168	LCD_printfxy(0,1,"Ni:%4i Ro:%4i ",ExternControl.Nick,ExternControl.Roll);
168	LCD_printfxy(0,2,"Gs:%4i Gi:%4i ",ExternControl.Gas,ExternControl.Gier);	169	LCD_printfxy(0,2,"Gs:%4i Gi:%4i ",ExternControl.Gas,ExternControl.Gier);

Subversion Repositories FlightCtrl

(root)/branches/V0.68d Code Redesign killagreg/menu.c @ 687 - Rev 685 → 687