Rev 2426 | Rev 2466 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2426 | Rev 2437 | ||
---|---|---|---|
Line 137... | Line 137... | ||
137 | break; |
137 | break; |
138 | case 2: |
138 | case 2: |
139 | LCD_printfxy(0,0,"act. bearing"); |
139 | LCD_printfxy(0,0,"act. bearing"); |
140 | LCD_printfxy(0,1,"Nick: %5i",IntegralNick/1024); |
140 | LCD_printfxy(0,1,"Nick: %5i",IntegralNick/1024); |
141 | LCD_printfxy(0,2,"Roll: %5i",IntegralRoll/1024); |
141 | LCD_printfxy(0,2,"Roll: %5i",IntegralRoll/1024); |
142 | LCD_printfxy(0,3,"Compass: %5i",ErsatzKompassInGrad); |
142 | LCD_printfxy(0,3,"Compass: %5i",CompassCorrected); |
143 | break; |
143 | break; |
144 | case 3: |
144 | case 3: |
145 | for(i=1;i<9;i+=2) LCD_printfxy(0,i/2,"K%i:%4i K%i:%4i ",i,PPM_in[i],i+1,PPM_in[i+1]); |
145 | for(i=1;i<9;i+=2) LCD_printfxy(0,i/2,"K%i:%4i K%i:%4i ",i,PPM_in[i],i+1,PPM_in[i+1]); |
146 | break; |
146 | break; |
147 | case 4: |
147 | case 4: |
Line 152... | Line 152... | ||
152 | break; |
152 | break; |
153 | case 5: |
153 | case 5: |
154 | LCD_printfxy(0,0,"Gyro - Sensor"); |
154 | LCD_printfxy(0,0,"Gyro - Sensor"); |
155 | LCD_printfxy(0,1,"Nick %4i (%3i.%x)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16, (AdNeutralNick%16)/2); |
155 | LCD_printfxy(0,1,"Nick %4i (%3i.%x)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16, (AdNeutralNick%16)/2); |
156 | LCD_printfxy(0,2,"Roll %4i (%3i.%x)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16, (AdNeutralRoll%16)/2); |
156 | LCD_printfxy(0,2,"Roll %4i (%3i.%x)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16, (AdNeutralRoll%16)/2); |
- | 157 | // LCD_printfxy(0,1,"Nick %4i (%4i)",AdWertNickFilter, AdNeutralNick); |
|
- | 158 | // LCD_printfxy(0,2,"Roll %4i (%4i)",AdWertRollFilter, AdNeutralRoll); |
|
157 | LCD_printfxy(0,3,"Yaw %4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2); |
159 | LCD_printfxy(0,3,"Yaw %4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2); |
- | 160 | ||
158 | /* |
161 | /* |
159 | // entfernt aus Platzmangel |
162 | // entfernt aus Platzmangel |
160 | if(PlatinenVersion == 10) |
163 | if(PlatinenVersion == 10) |
161 | { |
164 | { |
162 | LCD_printfxy(0,1,"Nick%4i (%3i.%i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/8, AdNeutralNick%8); |
165 | LCD_printfxy(0,1,"Nick%4i (%3i.%i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/8, AdNeutralNick%8); |
Line 222... | Line 225... | ||
222 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
225 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
223 | case 13: |
226 | case 13: |
224 | LCD_printfxy(0,0,"Compass"); |
227 | LCD_printfxy(0,0,"Compass"); |
225 | LCD_printfxy(0,1,"Magnet: %5i",KompassValue); |
228 | LCD_printfxy(0,1,"Magnet: %5i",KompassValue); |
226 | LCD_printfxy(0,2,"Gyro: %5i",ErsatzKompassInGrad); |
229 | LCD_printfxy(0,2,"Gyro: %5i",ErsatzKompassInGrad); |
227 | LCD_printfxy(0,3,"Setpoint: %5i",KompassSollWert); |
230 | LCD_printfxy(0,3,"True: %5i",CompassCorrected); |
228 | break; |
231 | break; |
229 | case 14: |
232 | case 14: |
230 | LCD_printfxy(0,0,"Servo " ); |
233 | LCD_printfxy(0,0,"Servo " ); |
231 | LCD_printfxy(0,1,"Setpoint %3i",Parameter_ServoNickControl); |
234 | LCD_printfxy(0,1,"Setpoint %3i",Parameter_ServoNickControl); |
232 | LCD_printfxy(0,2,"Position: %3i",ServoNickValue/4); |
235 | LCD_printfxy(0,2,"Position: %3i",ServoNickValue/4); |