Rev 1687 | Rev 1701 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1687 | Rev 1695 | ||
---|---|---|---|
Line 159... | Line 159... | ||
159 | AdWertAccHoch = (signed int) ADC - NeutralAccZ; |
159 | AdWertAccHoch = (signed int) ADC - NeutralAccZ; |
160 | if(AdWertAccHoch > 1) |
160 | if(AdWertAccHoch > 1) |
161 | { |
161 | { |
162 | if(NeutralAccZ < 750) |
162 | if(NeutralAccZ < 750) |
163 | { |
163 | { |
164 | subcount += 2; |
164 | subcount += 5; |
165 | if(modell_fliegt < 500) subcount += 10; |
165 | // if(modell_fliegt < 500) subcount += 10; |
166 | } |
166 | } |
167 | if(subcount > 100) { NeutralAccZ++; subcount -= 100;} |
167 | if(subcount > 100) { NeutralAccZ++; subcount -= 100;} |
168 | } |
168 | } |
169 | else if(AdWertAccHoch < -1) |
169 | else if(AdWertAccHoch < -1) |
170 | { |
170 | { |
171 | if(NeutralAccZ > 550) |
171 | if(NeutralAccZ > 550) |
172 | { |
172 | { |
173 | subcount -= 2; |
173 | subcount -= 5; |
174 | if(modell_fliegt < 500) subcount -= 10; |
174 | // if(modell_fliegt < 500) subcount -= 10; |
175 | if(subcount < -100) { NeutralAccZ--; subcount += 100;} |
175 | if(subcount < -100) { NeutralAccZ--; subcount += 100;} |
176 | } |
176 | } |
177 | } |
177 | } |
178 | /* |
178 | /* |
179 | AdWertAccHoch = (signed int) ADC - NeutralAccZ_float; |
179 | AdWertAccHoch = (signed int) ADC - NeutralAccZ_float; |
Line 256... | Line 256... | ||
256 | { |
256 | { |
257 | Luftdruck = (7 * Luftdruck + tmpLuftdruck - (18 * 523) * (long)ExpandBaro + 4) / 8; // -523.19 counts per 10 counts offset step |
257 | Luftdruck = (7 * Luftdruck + tmpLuftdruck - (18 * 523) * (long)ExpandBaro + 4) / 8; // -523.19 counts per 10 counts offset step |
258 | HoehenWert = StartLuftdruck - Luftdruck; |
258 | HoehenWert = StartLuftdruck - Luftdruck; |
259 | SummenHoehe -= SummenHoehe/SM_FILTER; |
259 | SummenHoehe -= SummenHoehe/SM_FILTER; |
260 | SummenHoehe += HoehenWert; |
260 | SummenHoehe += HoehenWert; |
261 | VarioMeter = (15 * VarioMeter + 8 * (int)(HoehenWert - SummenHoehe/SM_FILTER))/16; |
261 | VarioMeter = (31 * VarioMeter + 8 * (int)(HoehenWert - SummenHoehe/SM_FILTER))/32; |
262 | tmpLuftdruck /= 2; |
262 | tmpLuftdruck /= 2; |
263 | messanzahl_Druck = 18/2; |
263 | messanzahl_Druck = 18/2; |
264 | } |
264 | } |
265 | kanal = AD_NICK; |
265 | kanal = AD_NICK; |
266 | break; |
266 | break; |