Rev 1249 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1249 | Rev 1250 | ||
|---|---|---|---|
| Line 282... | Line 282... | ||
| 282 | case 2: |
282 | case 2: |
| 283 | gier1 = ADC; |
283 | gier1 = ADC; |
| 284 | kanal = AD_DRUCK; |
284 | kanal = AD_DRUCK; |
| 285 | break; |
285 | break; |
| 286 | case 3: |
286 | case 3: |
| 287 | tmpLuftdruck = ADC; |
287 | tmpLuftdruck += ADC; |
| - | 288 | messanzahl_Druck ++; |
|
| 288 | kanal = AD_NICK; |
289 | kanal = AD_NICK; |
| 289 | break; |
290 | break; |
| Line 290... | Line 291... | ||
| 290 | 291 | ||
| 291 | case 4: |
292 | case 4: |
| Line 359... | Line 360... | ||
| 359 | } |
360 | } |
| 360 | */ |
361 | */ |
| Line 361... | Line 362... | ||
| 361 | 362 | ||
| 362 | // MartinR: neu |
363 | // MartinR: neu |
| 363 | tmpLuftdruck += ADC; |
364 | tmpLuftdruck += ADC; |
| - | 365 | //MessLuftdruck = tmpLuftdruck / 2; |
|
| - | 366 | MessLuftdruck = ADC; |
|
| - | 367 | ||
| - | 368 | if(++messanzahl_Druck >= 5) |
|
| - | 369 | { |
|
| - | 370 | tmpLuftdruck -= 2616L * ExpandBaro; // -523.19 counts per 10 counts offset step |
|
| - | 371 | tmpLuftdruck /= 2; |
|
| - | 372 | messanzahl_Druck = 0; |
|
| 364 | MessLuftdruck = tmpLuftdruck / 2; |
373 | //HoeheD = (31 * HoeheD + (int) Parameter_Luftdruck_D * (int)((int)(StartLuftdruck - tmpLuftdruck) - HoehenWert))/32; // D-Anteil = neuerWert - AlterWert |
| - | 374 | Luftdruck = (tmpLuftdruck + 7 * Luftdruck + 4) / 8; |
|
| - | 375 | HoehenWert = StartLuftdruck - Luftdruck; |
|
| - | 376 | //tmpLuftdruck /= 2; |
|
| - | 377 | tmpLuftdruck = 0; |
|
| - | 378 | } |
|
| 365 | //Luftdruck = (MessLuftdruck + 7 * Luftdruck + 4) / 8; |
379 | |
| 366 | Luftdruck = (tmpLuftdruck + 7 * Luftdruck + 4) / 8; |
380 | // Luftdruck = (tmpLuftdruck + 7 * Luftdruck + 4) / 8; |
| Line 367... | Line 381... | ||
| 367 | // HoehenWert = 255 * ExpandBaro + StartLuftdruck - Luftdruck; // MartinR: zu Höhenregler |
381 | // HoehenWert = 255 * ExpandBaro + StartLuftdruck - Luftdruck; // MartinR: zu Höhenregler |
| 368 | 382 | ||