Rev 1639 | Rev 1660 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1639 | Rev 1643 | ||
|---|---|---|---|
| Line 23... | Line 23... | ||
| 23 | volatile int VarioMeter = 0; |
23 | volatile int VarioMeter = 0; |
| 24 | volatile unsigned int ZaehlMessungen = 0; |
24 | volatile unsigned int ZaehlMessungen = 0; |
| 25 | unsigned char AnalogOffsetNick = 115,AnalogOffsetRoll = 115,AnalogOffsetGier = 115; |
25 | unsigned char AnalogOffsetNick = 115,AnalogOffsetRoll = 115,AnalogOffsetGier = 115; |
| 26 | unsigned char GyroDefektN = 0,GyroDefektR = 0,GyroDefektG = 0; |
26 | unsigned char GyroDefektN = 0,GyroDefektR = 0,GyroDefektG = 0; |
| 27 | volatile unsigned char AdReady = 1; |
27 | volatile unsigned char AdReady = 1; |
| - | 28 | float NeutralAccZ_float; |
|
| 28 | //####################################################################################### |
29 | //####################################################################################### |
| 29 | // |
30 | // |
| 30 | void ADC_Init(void) |
31 | void ADC_Init(void) |
| 31 | //####################################################################################### |
32 | //####################################################################################### |
| 32 | { |
33 | { |
| Line 153... | Line 154... | ||
| 153 | case 7: |
154 | case 7: |
| 154 | UBat = (3 * UBat + ADC / 3) / 4; |
155 | UBat = (3 * UBat + ADC / 3) / 4; |
| 155 | kanal = AD_ACC_Z; |
156 | kanal = AD_ACC_Z; |
| 156 | break; |
157 | break; |
| 157 | case 8: |
158 | case 8: |
| - | 159 | ||
| 158 | AdWertAccHoch = (signed int) ADC - NeutralAccZ; |
160 | AdWertAccHoch = (signed int) ADC - NeutralAccZ; |
| 159 | if(AdWertAccHoch > 1) |
161 | if(AdWertAccHoch > 1) |
| 160 | { |
162 | { |
| 161 | if(NeutralAccZ < 750) |
163 | if(NeutralAccZ < 750) |
| 162 | { |
164 | { |
| Line 172... | Line 174... | ||
| 172 | subcount -= 2; |
174 | subcount -= 2; |
| 173 | if(modell_fliegt < 500) subcount -= 100; |
175 | if(modell_fliegt < 500) subcount -= 100; |
| 174 | if(subcount < -1000) { NeutralAccZ--; subcount += 1000;} |
176 | if(subcount < -1000) { NeutralAccZ--; subcount += 1000;} |
| 175 | } |
177 | } |
| 176 | } |
178 | } |
| 177 | messanzahl_AccHoch = 1; |
- | |
| 178 | Aktuell_az = ADC; |
- | |
| 179 | Mess_Integral_Hoch += AdWertAccHoch; // Integrieren |
- | |
| 180 | Mess_Integral_Hoch -= Mess_Integral_Hoch / 1024; // dämfen |
- | |
| 181 | - | ||
| 182 | /* |
179 | /* |
| 183 | AdWertAccHoch = (signed int) ADC - NeutralAccZ; |
180 | AdWertAccHoch = (signed int) ADC - NeutralAccZ_float; |
| 184 | if(AdWertAccHoch > 1) |
181 | if(AdWertAccHoch > 1) |
| 185 | { |
182 | { |
| 186 | if(NeutralAccZ < 750) |
183 | if(NeutralAccZ_float < 750) |
| 187 | { |
184 | { |
| 188 | NeutralAccZ += 0.02; |
185 | NeutralAccZ_float += 0.02; |
| 189 | if(modell_fliegt < 500) NeutralAccZ += 0.1; |
186 | if(modell_fliegt < 500) NeutralAccZ_float += 0.1; |
| 190 | } |
187 | } |
| 191 | } |
188 | } |
| 192 | else if(AdWertAccHoch < -1) |
189 | else if(AdWertAccHoch < -1) |
| 193 | { |
190 | { |
| 194 | if(NeutralAccZ > 550) |
191 | if(NeutralAccZ_float > 550) |
| 195 | { |
192 | { |
| 196 | NeutralAccZ-= 0.02; |
193 | NeutralAccZ_float-= 0.02; |
| 197 | if(modell_fliegt < 500) NeutralAccZ -= 0.1; |
194 | if(modell_fliegt < 500) NeutralAccZ_float -= 0.1; |
| 198 | } |
195 | } |
| 199 | } |
196 | } |
| - | 197 | */ |
|
| 200 | messanzahl_AccHoch = 1; |
198 | messanzahl_AccHoch = 1; |
| 201 | Aktuell_az = ADC; |
199 | Aktuell_az = ADC; |
| 202 | Mess_Integral_Hoch += AdWertAccHoch; // Integrieren |
200 | Mess_Integral_Hoch += AdWertAccHoch; // Integrieren |
| 203 | Mess_Integral_Hoch -= Mess_Integral_Hoch / 1024; // dämfen |
201 | Mess_Integral_Hoch -= Mess_Integral_Hoch / 1024; // dämfen |
| 204 | */ |
- | |
| 205 | kanal = AD_DRUCK; |
202 | kanal = AD_DRUCK; |
| 206 | break; |
203 | break; |
| 207 | // "case 8:" fehlt hier absichtlich |
204 | // "case 8:" fehlt hier absichtlich |
| 208 | case 10: |
205 | case 10: |
| 209 | nick1 += ADC; |
206 | nick1 += ADC; |