Subversion Repositories FlightCtrl

Rev

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

Rev 1935 Rev 1936
Line 32... Line 32...
32 
 if(DispPtr < 80) DisplayBuff[DispPtr++] = c;
 32 
 if(DispPtr < 80) DisplayBuff[DispPtr++] = c;
33 
}
 33 
}
Line 34... Line 34...
34 
 
 34 
 
35 
void Menu(void)
 35 
void Menu(void)
36 
 {
 36 
 {
37 
  char i;
 37 
  unsigned char i;
38 
  if(RemoteKeys & KEY1) { if(MenuePunkt) MenuePunkt--; else MenuePunkt = MaxMenue;}
 38 
  if(RemoteKeys & KEY1) { if(MenuePunkt) MenuePunkt--; else MenuePunkt = MaxMenue;}
39 
  if(RemoteKeys & KEY2) { if(MenuePunkt == MaxMenue) MenuePunkt = 0; else MenuePunkt++;}
 39 
  if(RemoteKeys & KEY2) { if(MenuePunkt == MaxMenue) MenuePunkt = 0; else MenuePunkt++;}
40 
  if((RemoteKeys & KEY1) && (RemoteKeys & KEY2)) MenuePunkt = 0;
 40 
  if((RemoteKeys & KEY1) && (RemoteKeys & KEY2)) MenuePunkt = 0;
41 
  LcdClear();
 41 
  LcdClear();
Line 49... Line 49...
49 
           LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",PlatinenVersion/10,PlatinenVersion%10, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH +'a');
 49 
           LCD_printfxy(0,1,"HW:V%d.%d SW:%d.%d%c",PlatinenVersion/10,PlatinenVersion%10, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH +'a');
50 
           LCD_printfxy(0,2,"Setting:%d %s", GetActiveParamSet(),Mixer.Name);
 50 
           LCD_printfxy(0,2,"Setting:%d %s", GetActiveParamSet(),Mixer.Name);
51 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
 51 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
52 
                        if(NC_ErrorCode)
 52 
                        if(NC_ErrorCode)
53 
                        {
 53 
                        {
54 
                                LCD_printfxy(0,3,"%2d:",NC_ErrorCode);
 54 
                                LCD_printfxy(0,3,"ERR%2d:",NC_ErrorCode);
55 
                                _printf_P(&Menu_Putchar, NC_ERROR_TEXT[NC_ErrorCode] , 0);
 55 
                                _printf_P(&Menu_Putchar, NC_ERROR_TEXT[NC_ErrorCode] , 0);
56 
                        }
 56 
                        }
57 
                   else
 57 
                   else
58 
#endif
 58 
#endif
59 
                   if(VersionInfo.HardwareError[0]) LCD_printfxy(0,3,"Hardware Error 1:%d !!",VersionInfo.HardwareError[0])
 59 
                   if(VersionInfo.HardwareError[0]) LCD_printfxy(0,3,"Hardware Error 1:%d !!",VersionInfo.HardwareError[0])
Line 164... Line 164...
164 
           LCD_printfxy(0,3,"Hi:%4i  Cf:%4i ",ExternControl.Hight,ExternControl.Config);
 164 
           LCD_printfxy(0,3,"Hi:%4i  Cf:%4i ",ExternControl.Hight,ExternControl.Config);
165 
           break;
 165 
           break;
166 
*/
 166 
*/
167 
    case 13:
 167 
    case 13:
168 
           LCD_printfxy(0,0,"BL-Ctrl Errors " );
 168 
           LCD_printfxy(0,0,"BL-Ctrl Errors " );
169 
                   for(i=1;i<4;i++)
 169 
                   for(i=0;i<3;i++)                                                              
170 
                   {
 170 
                   {
171 
                    LCD_printfxy(0,i,"%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);
 171 
                    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);
172 
                        if(i*4 >= RequiredMotors) break;
 172 
//                      if(i*4 >= RequiredMotors) break;
173 
                   }   
 173 
                   }   
174 
           break;
 174 
           break;
175 
    case 14:
 175 
    case 14:
176 
           LCD_printfxy(0,0,"BL Temperature" );
 176 
           LCD_printfxy(0,0,"BL Temperature" );
177 
                   for(i=1;i<4;i++)
 177 
                   for(i=0;i<3;i++)
178 
                    {
 178 
                    {
179 
                     LCD_printfxy(0,i,"%3d %3d %3d %3d ",Motor[i*4].Temperature,Motor[i*4+1].Temperature,Motor[i*4+2].Temperature,Motor[i*4+3].Temperature);
 179 
                     LCD_printfxy(0,i+1,"%3d %3d %3d %3d ",Motor[i*4].Temperature,Motor[i*4+1].Temperature,Motor[i*4+2].Temperature,Motor[i*4+3].Temperature);
180 
                         if(i*4 >= RequiredMotors) break;
 180 
//                       if(4 + i * 4 >= RequiredMotors) break;
181 
                        }                      
 181 
                        }                      
182 
           break;
 182 
           break;
183 
    case 15:
 183 
    case 15:
184 
           LCD_printfxy(0,0,"BL-Ctrl found " );
 184 
           LCD_printfxy(0,0,"BL-Ctrl found " );
185 
                   LCD_printfxy(0,1," %c   %c   %c   %c ",'-' + 4 * (Motor[0].State>>7),'-' + 5 * (Motor[1].State>>7),'-' + 6 * (Motor[2].State>>7),'-' + 7 * (Motor[3].State>>7));
 185 
                   LCD_printfxy(0,1," %c   %c   %c   %c ",'-' + 4 * (Motor[0].State>>7),'-' + 5 * (Motor[1].State>>7),'-' + 6 * (Motor[2].State>>7),'-' + 7 * (Motor[3].State>>7));