Rev 857 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 857 | Rev 858 | ||
---|---|---|---|
Line 271... | Line 271... | ||
271 | Mess_IntegralRoll2 = Mess_IntegralRoll; |
271 | Mess_IntegralRoll2 = Mess_IntegralRoll; |
272 | } |
272 | } |
273 | if(AdWertRoll < 15) MesswertRoll = -1000; |
273 | if(AdWertRoll < 15) MesswertRoll = -1000; |
274 | if(AdWertRoll < 7) MesswertRoll = -2000; |
274 | if(AdWertRoll < 7) MesswertRoll = -2000; |
275 | #if (PlatinenVersion == 10) |
275 | #if (PlatinenVersion == 10) |
276 | { |
- | |
277 | if(AdWertRoll > 1010) MesswertRoll = +1000; |
276 | if(AdWertRoll > 1010) MesswertRoll = +1000; |
278 | if(AdWertRoll > 1017) MesswertRoll = +2000; |
277 | if(AdWertRoll > 1017) MesswertRoll = +2000; |
279 | } |
- | |
280 | #else |
278 | #else |
281 | { |
- | |
282 | if(AdWertRoll > 2020) MesswertRoll = +1000; |
279 | if(AdWertRoll > 2020) MesswertRoll = +1000; |
283 | if(AdWertRoll > 2034) MesswertRoll = +2000; |
280 | if(AdWertRoll > 2034) MesswertRoll = +2000; |
284 | } |
- | |
285 | #endif |
281 | #endif |
286 | // Nick ++++++++++++++++++++++++++++++++++++++++++++++++ |
282 | // Nick ++++++++++++++++++++++++++++++++++++++++++++++++ |
287 | MesswertNick -= tmpl2; |
283 | MesswertNick -= tmpl2; |
288 | MesswertNick -= (tmpl*Parameter_AchsGegenKopplung1)/512L; |
284 | MesswertNick -= (tmpl*Parameter_AchsGegenKopplung1)/512L; |
289 | Mess_IntegralNick2 += MesswertNick; |
285 | Mess_IntegralNick2 += MesswertNick; |
Line 297... | Line 293... | ||
297 | { |
293 | { |
298 | Mess_IntegralNick = (Umschlag180Nick - 10000L); |
294 | Mess_IntegralNick = (Umschlag180Nick - 10000L); |
299 | Mess_IntegralNick2 = Mess_IntegralNick; |
295 | Mess_IntegralNick2 = Mess_IntegralNick; |
300 | } |
296 | } |
301 | if(AdWertNick < 15) MesswertNick = -1000; |
297 | if(AdWertNick < 15) MesswertNick = -1000; |
302 | if(AdWertNick < 7) MesswertNick = -2000; |
298 | if(AdWertNick < 7) MesswertNick = -2000; |
303 | #if(PlatinenVersion == 10) |
299 | #if (PlatinenVersion == 10) |
304 | { |
- | |
305 | if(AdWertNick > 1010) MesswertNick = +1000; |
300 | if(AdWertNick > 1010) MesswertNick = +1000; |
306 | if(AdWertNick > 1017) MesswertNick = +2000; |
301 | if(AdWertNick > 1017) MesswertNick = +2000; |
307 | } |
- | |
308 | #else |
302 | #else |
309 | { |
- | |
310 | if(AdWertNick > 2020) MesswertNick = +1000; |
303 | if(AdWertNick > 2020) MesswertNick = +1000; |
311 | if(AdWertNick > 2034) MesswertNick = +2000; |
304 | if(AdWertNick > 2034) MesswertNick = +2000; |
312 | } |
- | |
313 | #endif |
305 | #endif |
314 | //++++++++++++++++++++++++++++++++++++++++++++++++ |
306 | //++++++++++++++++++++++++++++++++++++++++++++++++ |
315 | // ADC einschalten |
307 | // ADC einschalten |
316 | ANALOG_ON; |
308 | ANALOG_ON; |
317 | //++++++++++++++++++++++++++++++++++++++++++++++++ |
309 | //++++++++++++++++++++++++++++++++++++++++++++++++ |