Subversion Repositories FlightCtrl

Rev

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

Rev 2342 Rev 2344
Line 87... Line 87...
87 
VarioPacket_t VarioPacket;
 87 
VarioPacket_t VarioPacket;
88 
ASCIIPacket_t ASCIIPacket;
 88 
ASCIIPacket_t ASCIIPacket;
89 
ElectricAirPacket_t ElectricAirPacket;
 89 
ElectricAirPacket_t ElectricAirPacket;
90 
HoTTGeneral_t HoTTGeneral;
 90 
HoTTGeneral_t HoTTGeneral;
91 
unsigned char SpeakHoTT = SPEAK_MIKROKOPTER;
 91 
unsigned char SpeakHoTT = SPEAK_MIKROKOPTER;
92 
unsigned char ToNC_SpeakHoTT = 0;
 92 
unsigned char ToNC_SpeakHoTT = 0, ShowSettingName = 0;
93 
int HoTTVarioMeter = 0;
 93 
int HoTTVarioMeter = 0;
94 
const char PROGMEM MIKROKOPTER[] =      {"     MikroKopter     "};
 94 
const char PROGMEM MIKROKOPTER[] =      {"     MikroKopter     "};
95 
const char PROGMEM UNDERVOLTAGE[] =     {" !! LiPo voltage !!  "};
 95 
const char PROGMEM UNDERVOLTAGE[] =     {" !! LiPo voltage !!  "};
- 
 
 96 
const char PROGMEM SETTING[] =  {"Set  :"};
96 
const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17] =
 97 
const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17] =
97 
{
 98 
{
98 
//0123456789123456
 99 
//0123456789123456
99 
 "No Error        \0",  // 0
 100 
 "No Error        \0",  // 0
100 
 "Not compatible  \0",  // 1
 101 
 "Not compatible  \0",  // 1
Line 360... Line 361...
360 
          if(tmp > 100) { VarioPacket.Text[15] = '0'+(tmp) / 100; tmp %= 100;} else VarioPacket.Text[15] = ' ';
 361 
          if(tmp > 100) { VarioPacket.Text[15] = '0'+(tmp) / 100; tmp %= 100;} else VarioPacket.Text[15] = ' ';
361 
      VarioPacket.Text[16] = '0'+(tmp) / 10;
 362 
      VarioPacket.Text[16] = '0'+(tmp) / 10;
362 
      VarioPacket.Text[17] = '0'+(tmp) % 10;
 363 
      VarioPacket.Text[17] = '0'+(tmp) % 10;
363 
      VarioPacket.Text[18] = 's';
 364 
      VarioPacket.Text[18] = 's';
364 
      VarioPacket.Text[19] = ' ';
 365 
      VarioPacket.Text[19] = ' ';
365 
//unsigned char NaviData_WaypointIndex = 0, NaviData_WaypointNumber = 0, NaviData_TargetHoldTime = 0;
 - 
 
366 
//unsigned int NaviData_TargetDistance = 0;
 - 
 
367 
         }
 366 
         }
368 
         else
 367 
         else
- 
 
 368 
         if(ShowSettingName) // no Error
- 
 
 369 
         {                  
- 
 
 370 
          ShowSettingName -= 2;
- 
 
 371 
          for(i=0; i<sizeof(SETTING);i++) VarioPacket.Text[i] = pgm_read_byte(&SETTING[i]);
- 
 
 372 
      VarioPacket.Text[4] = '0' + ActiveParamSet;
- 
 
 373 
          for(i=0; i<sizeof(EE_Parameter.Name);i++) VarioPacket.Text[i+7] = EE_Parameter.Name[i]; // no Error
- 
 
 374 
      VarioPacket.Text[18] = ' ';
- 
 
 375 
      VarioPacket.Text[19] = ' ';
- 
 
 376 
      VarioPacket.Text[20] = ' ';
- 
 
 377 
         }
- 
 
 378 
         else
- 
 
 379 
         {
369 
         for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i]); // no Error
 380 
         for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i]); // no Error
- 
 
 381 
         }
370 
                return(sizeof(VarioPacket));
 382 
                return(sizeof(VarioPacket));
371 
                break;
 383 
                break;
Line 372... Line 384...
372 
 
 384 
 
373 
  case HOTT_GPS_PACKET_ID:
 385 
  case HOTT_GPS_PACKET_ID:
Line 684... Line 696...
684 
  else
 696 
  else
685 
  if(page == 2)
 697 
  if(page == 2)
686 
  switch(line++)
 698 
  switch(line++)
687 
  {
 699 
  {
688 
        case 0:  
 700 
        case 0:  
689 
                        HoTT_printfxy_INV(0,0,"Setting:%u %s ",GetActiveParamSet(),EE_Parameter.Name);
 701 
                        HoTT_printfxy_INV(0,0,"Setting:%u %s ",ActiveParamSet,EE_Parameter.Name);
690 
                        break;
 702 
                        break;
691 
    case 1: HoTT_printfxy(0,1,"Min:%2i.%1iV %s ",BattLowVoltageWarning/10, BattLowVoltageWarning%10, Mixer.Name);
 703 
    case 1: HoTT_printfxy(0,1,"Min:%2i.%1iV %s ",BattLowVoltageWarning/10, BattLowVoltageWarning%10, Mixer.Name);
692 
                        break;
 704 
                        break;
693 
    case 2:  HoTT_printfxy(0,2,"ALT:");
 705 
    case 2:  HoTT_printfxy(0,2,"ALT:");
694 
                 if(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)
 706 
                 if(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)