Rev 373 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 373 | Rev 378 | ||
|---|---|---|---|
| Line 210... | Line 210... | ||
| 210 | IntegralNick2 = Mess_IntegralNick2; |
210 | IntegralNick2 = Mess_IntegralNick2; |
| 211 | IntegralRoll2 = Mess_IntegralRoll2; |
211 | IntegralRoll2 = Mess_IntegralRoll2; |
| 212 | // ADC einschalten |
212 | // ADC einschalten |
| 213 | ANALOG_ON; |
213 | ANALOG_ON; |
| Line -... | Line 214... | ||
| - | 214 | ||
| 214 | 215 | /* |
|
| 215 | //------------------------------------------------------------------------------ |
216 | //------------------------------------------------------------------------------ |
| 216 | if(MesswertNick > 200) MesswertNick += 4 * (MesswertNick - 200); |
217 | if(MesswertNick > 200) MesswertNick += 4 * (MesswertNick - 200); |
| 217 | else |
218 | else |
| Line 218... | Line 219... | ||
| 218 | if(MesswertNick < -200) MesswertNick += 4 * (MesswertNick + 200); |
219 | if(MesswertNick < -200) MesswertNick += 4 * (MesswertNick + 200); |
| 219 | 220 | ||
| 220 | if(MesswertRoll > 200) MesswertRoll += 4 * (MesswertRoll - 200); |
221 | if(MesswertRoll > 200) MesswertRoll += 4 * (MesswertRoll - 200); |
| 221 | else |
222 | else |
| - | 223 | if(MesswertRoll < -200) MesswertRoll += 4 * (MesswertRoll + 200); |
|
| 222 | if(MesswertRoll < -200) MesswertRoll += 4 * (MesswertRoll + 200); |
224 | //------------------------------------------------------------------------------ |
| 223 | //------------------------------------------------------------------------------ |
225 | */ |
| 224 | if(Poti1 < PPM_in[EE_Parameter.Kanalbelegung[K_POTI1]] + 110) Poti1++; else if(Poti1 > PPM_in[EE_Parameter.Kanalbelegung[K_POTI1]] + 110 && Poti1) Poti1--; |
226 | if(Poti1 < PPM_in[EE_Parameter.Kanalbelegung[K_POTI1]] + 110) Poti1++; else if(Poti1 > PPM_in[EE_Parameter.Kanalbelegung[K_POTI1]] + 110 && Poti1) Poti1--; |
| 225 | if(Poti2 < PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]] + 110) Poti2++; else if(Poti2 > PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]] + 110 && Poti2) Poti2--; |
227 | if(Poti2 < PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]] + 110) Poti2++; else if(Poti2 > PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]] + 110 && Poti2) Poti2--; |
| 226 | if(Poti3 < PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]] + 110) Poti3++; else if(Poti3 > PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]] + 110 && Poti3) Poti3--; |
228 | if(Poti3 < PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]] + 110) Poti3++; else if(Poti3 > PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]] + 110 && Poti3) Poti3--; |
| Line 686... | Line 688... | ||
| 686 | DebugOut.Analog[5] = HoehenWert; |
688 | DebugOut.Analog[5] = HoehenWert; |
| 687 | DebugOut.Analog[6] = (Mess_Integral_Hoch / 512); |
689 | DebugOut.Analog[6] = (Mess_Integral_Hoch / 512); |
| 688 | DebugOut.Analog[7] = GasMischanteil; |
690 | DebugOut.Analog[7] = GasMischanteil; |
| 689 | DebugOut.Analog[8] = KompassValue; |
691 | DebugOut.Analog[8] = KompassValue; |
| Line 690... | Line -... | ||
| 690 | - | ||
| 691 | DebugOut.Analog[9] = MM3.x_axis; |
- | |
| 692 | DebugOut.Analog[10] = MM3.y_axis; |
692 | |
| Line 693... | Line 693... | ||
| 693 | DebugOut.Analog[11] = MM3.z_axis; |
693 | // Kanäle 9 bis 11 in compass.c |
| 694 | 694 | ||
| 695 | // DebugOut.Analog[9] = SollHoehe; |
695 | // DebugOut.Analog[9] = SollHoehe; |
| 696 | // DebugOut.Analog[10] = Mess_Integral_Gier / 128; |
696 | // DebugOut.Analog[10] = Mess_Integral_Gier / 128; |