Rev 2341 | Rev 2369 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2341 | Rev 2367 | ||
|---|---|---|---|
| Line 125... | Line 125... | ||
| 125 | LCD_printfxy(0,0,"Height: %5i",(int)(HoehenWert/5)); |
125 | LCD_printfxy(0,0,"Height: %5i",(int)(HoehenWert/5)); |
| 126 | LCD_printfxy(0,1,"Setpoint:%5i",(int)(SollHoehe/5)); |
126 | LCD_printfxy(0,1,"Setpoint:%5i",(int)(SollHoehe/5)); |
| 127 | LCD_printfxy(0,2,"Pressure:%5i",MessLuftdruck); |
127 | LCD_printfxy(0,2,"Pressure:%5i",MessLuftdruck); |
| 128 | LCD_printfxy(0,3,"Offset: %5i",OCR0A); |
128 | LCD_printfxy(0,3,"Offset: %5i",OCR0A); |
| 129 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
129 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| 130 | if(ACC_AltitudeControl) LCD_printfxy(17,3,"(A)",OCR0A); |
130 | if(ACC_AltitudeControl) LCD_printfxy(17,2,"(A)"); |
| 131 | #endif |
131 | #endif |
| 132 | } |
132 | } |
| 133 | else |
133 | else |
| 134 | { |
134 | { |
| 135 | LCD_printfxy(0,0,"Height control"); |
135 | LCD_printfxy(0,0,"Height control"); |
| Line 206... | Line 206... | ||
| 206 | break; |
206 | break; |
| 207 | case 11: |
207 | case 11: |
| 208 | for(i=0;i<4;i++) LCD_printfxy(0,i,"Poti%i: %3i",i+5,Poti[i+4]); |
208 | for(i=0;i<4;i++) LCD_printfxy(0,i,"Poti%i: %3i",i+5,Poti[i+4]); |
| 209 | break; |
209 | break; |
| 210 | case 12: |
210 | case 12: |
| - | 211 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
|
| 211 | LCD_printfxy(0,0,"Servo " ); |
212 | LCD_printfxy(0,0,"Servo " ); |
| 212 | LCD_printfxy(0,1,"Setpoint %3i",Parameter_ServoNickControl); |
213 | LCD_printfxy(0,1,"Setpoint %3i",Parameter_ServoNickControl); |
| 213 | LCD_printfxy(0,2,"Position: %3i",ServoNickValue/4); |
214 | LCD_printfxy(0,2,"Position: %3i",ServoNickValue/4); |
| 214 | LCD_printfxy(0,3,"Range:%3i-%3i",EE_Parameter.ServoNickMin,EE_Parameter.ServoNickMax); |
215 | LCD_printfxy(0,3,"Range:%3i-%3i",EE_Parameter.ServoNickMin,EE_Parameter.ServoNickMax); |
| 215 | break; |
216 | break; |
| Line 218... | Line 219... | ||
| 218 | LCD_printfxy(0,1,"Ni:%4i Ro:%4i ",ExternControl.Nick,ExternControl.Roll); |
219 | LCD_printfxy(0,1,"Ni:%4i Ro:%4i ",ExternControl.Nick,ExternControl.Roll); |
| 219 | LCD_printfxy(0,2,"Gs:%4i Gi:%4i ",ExternControl.Gas,ExternControl.Gier); |
220 | LCD_printfxy(0,2,"Gs:%4i Gi:%4i ",ExternControl.Gas,ExternControl.Gier); |
| 220 | LCD_printfxy(0,3,"Hi:%4i Cf:%4i ",ExternControl.Hight,ExternControl.Config); |
221 | LCD_printfxy(0,3,"Hi:%4i Cf:%4i ",ExternControl.Hight,ExternControl.Config); |
| 221 | break; |
222 | break; |
| 222 | */ |
223 | */ |
| - | 224 | #endif |
|
| 223 | case 13: |
225 | case 13: |
| 224 | LCD_printfxy(0,0,"BL-Ctrl Errors " ); |
226 | LCD_printfxy(0,0,"BL-Ctrl Errors " ); |
| 225 | for(i=0;i<3;i++) |
227 | for(i=0;i<3;i++) |
| 226 | { |
228 | { |
| 227 | LCD_printfxy(0,i+1,"%3d %3d %3d %3d ",Motor[i*4].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+1].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+2].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+3].State & MOTOR_STATE_ERROR_MASK); |
229 | LCD_printfxy(0,i+1,"%3d %3d %3d %3d ",Motor[i*4].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+1].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+2].State & MOTOR_STATE_ERROR_MASK,Motor[i*4+3].State & MOTOR_STATE_ERROR_MASK); |