Subversion Repositories FlightCtrl

Rev

Rev 2370 | Rev 2379 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2370 Rev 2373
Line 118... Line 118...
118 
//                 if(VersionInfo.HardwareError[1]) LCD_printfxy(0,3,"Error 2:%d !!",VersionInfo.HardwareError[1])
 118 
//                 if(VersionInfo.HardwareError[1]) LCD_printfxy(0,3,"Error 2:%d !!",VersionInfo.HardwareError[1])
119 
                   else
 119 
                   else
120 
           if(I2CTimeout < 6) LCD_printfxy(0,3,"I2C ERROR!!!")
 120 
           if(I2CTimeout < 6) LCD_printfxy(0,3,"I2C ERROR!!!")
121 
           break;
 121 
           break;
122 
    case 1:
 122 
    case 1:
123 
          if(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)
 - 
 
124 
           {
 - 
 
125 
           LCD_printfxy(0,0,"Height:  %5i",(int)(HoehenWert/5));
 123 
           LCD_printfxy(0,0,"Height:  %5i",(int)(HoehenWert/5));
126 
           LCD_printfxy(0,1,"Setpoint:%5i",(int)(SollHoehe/5));
 124 
           LCD_printfxy(0,1,"Setpoint:%5i",(int)(SollHoehe/5));
127 
           LCD_printfxy(0,2,"Pressure:%5i",MessLuftdruck);
 125 
           LCD_printfxy(0,2,"Pressure:%5i",MessLuftdruck);
128 
           LCD_printfxy(0,3,"Offset:  %5i",OCR0A);
 126 
           LCD_printfxy(0,3,"Offset:  %5i",OCR0A);
129 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
 127 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
Line 131... Line 129...
131 
                    {
 129 
                    {
132 
                         LCD_printfxy(17,2,"(A)");
 130 
                         LCD_printfxy(17,2,"(A)");
133 
                         LCD_printfxy(17,3,"%i",CalAthmospheare);
 131 
                         LCD_printfxy(17,3,"%i",CalAthmospheare);
134 
                        }
 132 
                        }
135 
#endif
 133 
#endif
136 
           }
 - 
 
137 
           else
 - 
 
138 
           {
 - 
 
139 
           LCD_printfxy(0,0,"Height control");
 - 
 
140 
           LCD_printfxy(0,1,"DISABLED");
 - 
 
141 
           //LCD_printfxy(0,2,"Height control");
 - 
 
142 
           //LCD_printfxy(0,3,"DISABLED");
 - 
 
143 
           }
 - 
 
144 
 
 - 
 
145 
           break;
 134 
           break;
146 
    case 2:
 135 
    case 2:
147 
           LCD_printfxy(0,0,"act. bearing");
 136 
           LCD_printfxy(0,0,"act. bearing");
148 
           LCD_printfxy(0,1,"Nick:      %5i",IntegralNick/1024);
 137 
           LCD_printfxy(0,1,"Nick:      %5i",IntegralNick/1024);
149 
           LCD_printfxy(0,2,"Roll:      %5i",IntegralRoll/1024);
 138 
           LCD_printfxy(0,2,"Roll:      %5i",IntegralRoll/1024);
Line 158... Line 147...
158 
           LCD_printfxy(0,2,"P1:%4i  P2:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI1]]+127,PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]]+127);
 147 
           LCD_printfxy(0,2,"P1:%4i  P2:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI1]]+127,PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]]+127);
159 
           LCD_printfxy(0,3,"P3:%4i  P4:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]]+127,PPM_in[EE_Parameter.Kanalbelegung[K_POTI4]]+127);
 148 
           LCD_printfxy(0,3,"P3:%4i  P4:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]]+127,PPM_in[EE_Parameter.Kanalbelegung[K_POTI4]]+127);
160 
           break;
 149 
           break;
161 
    case 5:
 150 
    case 5:
162 
           LCD_printfxy(0,0,"Gyro - Sensor");
 151 
           LCD_printfxy(0,0,"Gyro - Sensor");
- 
 
 152 
           LCD_printfxy(0,1,"Nick %4i (%3i.%x)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16, (AdNeutralNick%16)/2);
- 
 
 153 
           LCD_printfxy(0,2,"Roll %4i (%3i.%x)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16, (AdNeutralRoll%16)/2);
- 
 
 154 
           LCD_printfxy(0,3,"Yaw  %4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2);
- 
 
 155 
/*
- 
 
 156 
// entfernt aus Platzmangel
163 
          if(PlatinenVersion == 10)
 157 
          if(PlatinenVersion == 10)
164 
          {
 158 
          {
165 
           LCD_printfxy(0,1,"Nick%4i (%3i.%i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/8, AdNeutralNick%8);
 159 
           LCD_printfxy(0,1,"Nick%4i (%3i.%i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/8, AdNeutralNick%8);
166 
           LCD_printfxy(0,2,"Roll%4i (%3i.%i)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/8, AdNeutralRoll%8);
 160 
           LCD_printfxy(0,2,"Roll%4i (%3i.%i)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/8, AdNeutralRoll%8);
167 
           LCD_printfxy(0,3,"Gier%4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier);
 161 
           LCD_printfxy(0,3,"Gier%4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier);
Line 178... Line 172...
178 
          {
 172 
          {
179 
           LCD_printfxy(0,1,"Nick %4i (%3i)(%3i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16,AnalogOffsetNick);
 173 
           LCD_printfxy(0,1,"Nick %4i (%3i)(%3i)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16,AnalogOffsetNick);
180 
           LCD_printfxy(0,2,"Roll %4i (%3i)(%3i)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16,AnalogOffsetRoll);
 174 
           LCD_printfxy(0,2,"Roll %4i (%3i)(%3i)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16,AnalogOffsetRoll);
181 
           LCD_printfxy(0,3,"Yaw  %4i (%3i)(%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2,AnalogOffsetGier);
 175 
           LCD_printfxy(0,3,"Yaw  %4i (%3i)(%3i)",AdNeutralGier - AdWertGier, AdNeutralGier/2,AnalogOffsetGier);
182 
          }
 176 
          }
- 
 
 177 
*/
183 
           break;
 178 
           break;
184 
    case 6:
 179 
    case 6:
185 
           LCD_printfxy(0,0,"ACC - Sensor");
 180 
           LCD_printfxy(0,0,"ACC - Sensor");
186 
           LCD_printfxy(0,1,"Nick %4i (%3i)",AdWertAccNick,NeutralAccX);
 181 
           LCD_printfxy(0,1,"Nick %4i (%3i)",AdWertAccNick,NeutralAccX);
187 
           LCD_printfxy(0,2,"Roll %4i (%3i)",AdWertAccRoll,NeutralAccY);
 182 
           LCD_printfxy(0,2,"Roll %4i (%3i)",AdWertAccRoll,NeutralAccY);