Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 857 → Rev 858

/branches/MicroMag3_Nick666/trunc/analog.c
98,7 → 98,7
kanal = 1;
break;
case 7:
#if(PlatinenVersion == 10)
#if (PlatinenVersion == 10)
AdWertRoll = (ADC + roll1) / 2;
#else
AdWertRoll = ADC + roll1;
/branches/MicroMag3_Nick666/trunc/fc.c
273,15 → 273,11
if(AdWertRoll < 15) MesswertRoll = -1000;
if(AdWertRoll < 7) MesswertRoll = -2000;
#if (PlatinenVersion == 10)
{
if(AdWertRoll > 1010) MesswertRoll = +1000;
if(AdWertRoll > 1017) MesswertRoll = +2000;
}
#else
{
if(AdWertRoll > 2020) MesswertRoll = +1000;
if(AdWertRoll > 2034) MesswertRoll = +2000;
}
#endif
// Nick ++++++++++++++++++++++++++++++++++++++++++++++++
MesswertNick -= tmpl2;
299,17 → 295,13
Mess_IntegralNick2 = Mess_IntegralNick;
}
if(AdWertNick < 15) MesswertNick = -1000;
if(AdWertNick < 7) MesswertNick = -2000;
#if(PlatinenVersion == 10)
{
if(AdWertNick < 7) MesswertNick = -2000;
#if (PlatinenVersion == 10)
if(AdWertNick > 1010) MesswertNick = +1000;
if(AdWertNick > 1017) MesswertNick = +2000;
}
#else
{
if(AdWertNick > 1017) MesswertNick = +2000;
#else
if(AdWertNick > 2020) MesswertNick = +1000;
if(AdWertNick > 2034) MesswertNick = +2000;
}
if(AdWertNick > 2034) MesswertNick = +2000;
#endif
//++++++++++++++++++++++++++++++++++++++++++++++++
// ADC einschalten
/branches/MicroMag3_Nick666/trunc/main.c
117,7 → 117,7
StickGier = 0; PPM_in[K_GAS] = 0;StickRoll = 0; StickNick = 0;
 
ROT_OFF;
Timer_Init();
UART_Init();
rc_sum_init();
/branches/MicroMag3_Nick666/trunc/menu.c
78,18 → 78,14
break;
case 5:
LCD_printfxy(0,0,"Gyro - Sensor");
#if(PlatinenVersion == 10)
{
#if (PlatinenVersion == 10)
LCD_printfxy(0,1,"Nick %4i (%3i)",AdWertNick - AdNeutralNick, AdNeutralNick);
LCD_printfxy(0,2,"Roll %4i (%3i)",AdWertRoll - AdNeutralRoll, AdNeutralRoll);
LCD_printfxy(0,3,"Gier %4i (%3i)",MesswertGier, AdNeutralGier);
}
#else
{
#else
LCD_printfxy(0,1,"Nick %4i (%3i)",AdWertNick - AdNeutralNick, AdNeutralNick/2);
LCD_printfxy(0,2,"Roll %4i (%3i)",AdWertRoll - AdNeutralRoll, AdNeutralRoll/2);
LCD_printfxy(0,3,"Gier %4i (%3i)",MesswertGier, AdNeutralGier/2);
}
#endif
break;
case 6: