WebSVN - FlightCtrl - Diff - Rev 1642 and 1643 - /branches/V0.86d_ACC-HH_HR



unsigned int BaroExpandActive = 0;
volatile unsigned int I2CTimeout = 100;
int MesswertNick,MesswertRoll,MesswertGier,MesswertGierBias, RohMesswertNick,RohMesswertRoll;
int TrimNick, TrimRoll;
int AdNeutralNick = 0,AdNeutralRoll = 0,AdNeutralGier = 0,StartNeutralRoll = 0,StartNeutralNick = 0;
int Mittelwert_AccNick, Mittelwert_AccRoll,Mittelwert_AccHoch;
unsigned int NeutralAccX=0, NeutralAccY=0;
int NaviAccNick, NaviAccRoll,NaviCntAcc = 0;
int NeutralAccZ = 0;
unsigned char CosinusNickWinkel = 0, CosinusRollWinkel = 0;
long IntegralNick = 0,IntegralNick2 = 0;
long IntegralRoll = 0,IntegralRoll2 = 0;

    DebugOut.Analog[1] = IntegralRoll / (EE_Parameter.GyroAccFaktor * 4);
    DebugOut.Analog[2] = Mittelwert_AccNick / 4;
    DebugOut.Analog[3] = Mittelwert_AccRoll / 4;
    DebugOut.Analog[4] = MesswertGier;
    DebugOut.Analog[5] = HoehenWert/5;
    DebugOut.Analog[6] = (Mess_Integral_Hoch / 512);//AdWertAccHoch;// Aktuell_az;//(Mess_Integral_Hoch / 512);//Aktuell_az;
    DebugOut.Analog[8] = KompassValue;
    DebugOut.Analog[9] = UBat;
    DebugOut.Analog[10] = SenderOkay;
    DebugOut.Analog[11] = ErsatzKompass / GIER_GRAD_FAKTOR;
DebugOut.Analog[16] = NeutralAccZ;
 
        //DebugOut.Analog[16] = Motor[0].Temperature;
    //DebugOut.Analog[17] = FromNaviCtrl_Value.Distance;
//    DebugOut.Analog[18] = VarioMeter;
//    DebugOut.Analog[19] = WinkelOut.CalcState;
    DebugOut.Analog[20] = ServoNickValue;

Subversion Repositories FlightCtrl

(root)/branches/V0.86d_ACC-HH_HR_MartinR/fc.c @ 2226 - Rev 1642 → 1643

Rev 1642		Rev 1643
Line 61...		Line 61...
61	unsigned int BaroExpandActive = 0;	61	unsigned int BaroExpandActive = 0;
62	volatile unsigned int I2CTimeout = 100;	62	volatile unsigned int I2CTimeout = 100;
63	int MesswertNick,MesswertRoll,MesswertGier,MesswertGierBias, RohMesswertNick,RohMesswertRoll;	63	int MesswertNick,MesswertRoll,MesswertGier,MesswertGierBias, RohMesswertNick,RohMesswertRoll;
64	int TrimNick, TrimRoll;	64	int TrimNick, TrimRoll;
65	int AdNeutralNick = 0,AdNeutralRoll = 0,AdNeutralGier = 0,StartNeutralRoll = 0,StartNeutralNick = 0;	65	int AdNeutralNick = 0,AdNeutralRoll = 0,AdNeutralGier = 0,StartNeutralRoll = 0,StartNeutralNick = 0;
66	int Mittelwert_AccNick, Mittelwert_AccRoll,Mittelwert_AccHoch, NeutralAccX=0, NeutralAccY=0;	66	int Mittelwert_AccNick, Mittelwert_AccRoll,Mittelwert_AccHoch;
-		67	unsigned int NeutralAccX=0, NeutralAccY=0;
67	int NaviAccNick, NaviAccRoll,NaviCntAcc = 0;	68	int NaviAccNick, NaviAccRoll,NaviCntAcc = 0;
68	int NeutralAccZ = 0;	69	int NeutralAccZ = 0;
69	unsigned char CosinusNickWinkel = 0, CosinusRollWinkel = 0;	70	unsigned char CosinusNickWinkel = 0, CosinusRollWinkel = 0;
70	long IntegralNick = 0,IntegralNick2 = 0;	71	long IntegralNick = 0,IntegralNick2 = 0;
71	long IntegralRoll = 0,IntegralRoll2 = 0;	72	long IntegralRoll = 0,IntegralRoll2 = 0;
Line 182...		Line 183...
182	DebugOut.Analog[1] = IntegralRoll / (EE_Parameter.GyroAccFaktor * 4);	183	DebugOut.Analog[1] = IntegralRoll / (EE_Parameter.GyroAccFaktor * 4);
183	DebugOut.Analog[2] = Mittelwert_AccNick / 4;	184	DebugOut.Analog[2] = Mittelwert_AccNick / 4;
184	DebugOut.Analog[3] = Mittelwert_AccRoll / 4;	185	DebugOut.Analog[3] = Mittelwert_AccRoll / 4;
185	DebugOut.Analog[4] = MesswertGier;	186	DebugOut.Analog[4] = MesswertGier;
186	DebugOut.Analog[5] = HoehenWert/5;	187	DebugOut.Analog[5] = HoehenWert/5;
187	DebugOut.Analog[6] = AdWertAccHoch;// Aktuell_az;//(Mess_Integral_Hoch / 512);//Aktuell_az;	188	DebugOut.Analog[6] = (Mess_Integral_Hoch / 512);//AdWertAccHoch;// Aktuell_az;//(Mess_Integral_Hoch / 512);//Aktuell_az;
188	DebugOut.Analog[8] = KompassValue;	189	DebugOut.Analog[8] = KompassValue;
189	DebugOut.Analog[9] = UBat;	190	DebugOut.Analog[9] = UBat;
190	DebugOut.Analog[10] = SenderOkay;	191	DebugOut.Analog[10] = SenderOkay;
191	DebugOut.Analog[11] = ErsatzKompass / GIER_GRAD_FAKTOR;	192	DebugOut.Analog[11] = ErsatzKompass / GIER_GRAD_FAKTOR;
192	DebugOut.Analog[16] = NeutralAccZ;	193	DebugOut.Analog[16] = NeutralAccZ;
193	DebugOut.Analog[18] = TransmitBlConfig;	-
194	//DebugOut.Analog[16] = Motor[0].Temperature;	194	//DebugOut.Analog[16] = Motor[0].Temperature;
195	//DebugOut.Analog[17] = FromNaviCtrl_Value.Distance;	195	//DebugOut.Analog[17] = FromNaviCtrl_Value.Distance;
196	// DebugOut.Analog[18] = VarioMeter;	196	// DebugOut.Analog[18] = VarioMeter;
197	// DebugOut.Analog[19] = WinkelOut.CalcState;	197	// DebugOut.Analog[19] = WinkelOut.CalcState;
198	DebugOut.Analog[20] = ServoNickValue;	198	DebugOut.Analog[20] = ServoNickValue;