Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 966 → Rev 973

/branches/KalmanFilter MikeW/analog.c
17,15 → 17,14
 
 
int UBat = 100; /* Initial Battery Guess */
int AdWertNick = 0, AdWertRoll = 0, AdWertGier = 0;
int AdWertNick_Raw = 0, AdWertRoll_Raw = 0, AdWertGier_Raw = 0;
int AdWertAccRoll = 0,AdWertAccNick = 0,AdWertAccHoch = 0;
int AdWertNick_Raw = 0, AdWertRoll_Raw = 0, AdWertGier_Raw = 0;
int AdWertAccRoll_Raw = 0,AdWertAccNick_Raw = 0,AdWertAccHoch_Raw = 0;
 
int AccumulatedACC_X = 0, AccumulatedACC_Y = 0, AccumulatedACC_Z = 0, AccumulatedAirPressure = 0;
int AccumulatedACC_X_cnt = 0, AccumulatedACC_Y_cnt = 0, AccumulatedACC_Z_cnt = 0, AccumulatedAirPressure_cnt = 0;
int AccumulatedRoll_X = 0, AccumulatedRoll_Y = 0, AccumulatedRoll_Z = 0;
int AccumulatedRoll_X_cnt = 0, AccumulatedRoll_Y_cnt = 0, AccumulatedRoll_Z_cnt = 0;
int AccumulatedRoll = 0, AccumulatedNick = 0, AccumulatedGier = 0;
int AccumulatedRoll_cnt = 0, AccumulatedNick_cnt = 0, AccumulatedGier_cnt = 0;
 
unsigned int AdWertAirPressure_Raw = 1023;
 
92,24 → 91,21
switch(state++)
{
case 0:
AdWertGier = ADC;
AdWertGier_Raw = ADC;
AccumulatedRoll_Z += (ADC - AdNeutralGier);
AccumulatedRoll_Z_cnt++;
AccumulatedGier += (ADC - AdNeutralGier);
AccumulatedGier_cnt++;
kanal = 1;
break;
case 1:
AdWertRoll = ADC;
AdWertRoll_Raw = ADC;
AccumulatedRoll_X += (ADC - AdNeutralRoll);
AccumulatedRoll_X_cnt++;
AccumulatedRoll += (ADC - AdNeutralRoll);
AccumulatedRoll_cnt++;
kanal = 2;
break;
case 2:
AdWertNick = ADC;
AdWertNick_Raw = ADC;
AccumulatedRoll_Y += (ADC - AdNeutralNick);
AccumulatedRoll_Y_cnt++;
AccumulatedNick += (ADC - AdNeutralNick);
AccumulatedNick_cnt++;
kanal = 4;
break;
case 3: