Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2380 → Rev 2384

/branches/V2.01a_ACC-HH_MartinR/uart.c
128,11 → 128,11
"Motor 2 ",
"Motor 3 ",
"Motor 4 ", //15
"16 ",
"17 ",
"18 ",
"19 ",
"Servo ", //20
"PAN-Cos ",//MartinR
"PAN-Sin ",//MartinR
"PAN-Servo ",//MartinR
"Servo-Roll ",//MartinR
"Servo-Nick ", //20
"Hovergas ",
"Current [0.1A] ",
"Capacity [mAh] ",
772,8 → 772,10
{
WinkelOut.Winkel[0] = ToNaviCtrl.IntegralNick;//(int) (IntegralNick / (EE_Parameter.GyroAccFaktor * 4)); // etwa in 0.1 Grad
WinkelOut.Winkel[1] = ToNaviCtrl.IntegralRoll;//(int) (IntegralRoll / (EE_Parameter.GyroAccFaktor * 4)); // etwa in 0.1 Grad
WinkelOut.UserParameter[0] = Parameter_UserParam1;
WinkelOut.UserParameter[1] = Parameter_UserParam2;
//WinkelOut.UserParameter[0] = Parameter_UserParam1;//MartinR: so war es
//WinkelOut.UserParameter[1] = Parameter_UserParam2;
WinkelOut.UserParameter[0] = 0; // Martin R: deaktiviert,da userParameter amnderweitig verwendet
WinkelOut.UserParameter[1] = 0;
SendOutData('k', MK3MAG_ADDRESS, 1, (unsigned char *) &WinkelOut,sizeof(WinkelOut));
if(WinkelOut.CalcState > 4) WinkelOut.CalcState = 6; // wird dann in SPI auf Null gesetzt
if(!NaviDataOkay) Kompass_Timer = SetDelay(99);