Rev 2380 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2380 | Rev 2384 | ||
|---|---|---|---|
| Line 126... | Line 126... | ||
| 126 | "Gyro Compass ", |
126 | "Gyro Compass ", |
| 127 | "Motor 1 ", |
127 | "Motor 1 ", |
| 128 | "Motor 2 ", |
128 | "Motor 2 ", |
| 129 | "Motor 3 ", |
129 | "Motor 3 ", |
| 130 | "Motor 4 ", //15 |
130 | "Motor 4 ", //15 |
| 131 | "16 ", |
131 | "PAN-Cos ",//MartinR |
| 132 | "17 ", |
132 | "PAN-Sin ",//MartinR |
| 133 | "18 ", |
133 | "PAN-Servo ",//MartinR |
| 134 | "19 ", |
134 | "Servo-Roll ",//MartinR |
| 135 | "Servo ", //20 |
135 | "Servo-Nick ", //20 |
| 136 | "Hovergas ", |
136 | "Hovergas ", |
| 137 | "Current [0.1A] ", |
137 | "Current [0.1A] ", |
| 138 | "Capacity [mAh] ", |
138 | "Capacity [mAh] ", |
| 139 | "Height Setpoint ", |
139 | "Height Setpoint ", |
| 140 | "25 ", //25 |
140 | "25 ", //25 |
| Line 770... | Line 770... | ||
| 770 | } |
770 | } |
| 771 | if((CheckDelay(Kompass_Timer)) && UebertragungAbgeschlossen) |
771 | if((CheckDelay(Kompass_Timer)) && UebertragungAbgeschlossen) |
| 772 | { |
772 | { |
| 773 | WinkelOut.Winkel[0] = ToNaviCtrl.IntegralNick;//(int) (IntegralNick / (EE_Parameter.GyroAccFaktor * 4)); // etwa in 0.1 Grad |
773 | WinkelOut.Winkel[0] = ToNaviCtrl.IntegralNick;//(int) (IntegralNick / (EE_Parameter.GyroAccFaktor * 4)); // etwa in 0.1 Grad |
| 774 | WinkelOut.Winkel[1] = ToNaviCtrl.IntegralRoll;//(int) (IntegralRoll / (EE_Parameter.GyroAccFaktor * 4)); // etwa in 0.1 Grad |
774 | WinkelOut.Winkel[1] = ToNaviCtrl.IntegralRoll;//(int) (IntegralRoll / (EE_Parameter.GyroAccFaktor * 4)); // etwa in 0.1 Grad |
| 775 | WinkelOut.UserParameter[0] = Parameter_UserParam1; |
775 | //WinkelOut.UserParameter[0] = Parameter_UserParam1;//MartinR: so war es |
| 776 | WinkelOut.UserParameter[1] = Parameter_UserParam2; |
776 | //WinkelOut.UserParameter[1] = Parameter_UserParam2; |
| - | 777 | WinkelOut.UserParameter[0] = 0; // Martin R: deaktiviert,da userParameter amnderweitig verwendet |
|
| - | 778 | WinkelOut.UserParameter[1] = 0; |
|
| 777 | SendOutData('k', MK3MAG_ADDRESS, 1, (unsigned char *) &WinkelOut,sizeof(WinkelOut)); |
779 | SendOutData('k', MK3MAG_ADDRESS, 1, (unsigned char *) &WinkelOut,sizeof(WinkelOut)); |
| 778 | if(WinkelOut.CalcState > 4) WinkelOut.CalcState = 6; // wird dann in SPI auf Null gesetzt |
780 | if(WinkelOut.CalcState > 4) WinkelOut.CalcState = 6; // wird dann in SPI auf Null gesetzt |
| 779 | if(!NaviDataOkay) Kompass_Timer = SetDelay(99); |
781 | if(!NaviDataOkay) Kompass_Timer = SetDelay(99); |
| 780 | else Kompass_Timer = SetDelay(999); |
782 | else Kompass_Timer = SetDelay(999); |
| 781 | } |
783 | } |