WebSVN - FlightCtrl - Diff - Rev 2072 and 2090

 GPSPacket_t GPSPacket;
 VarioPacket_t VarioPacket;
 ASCIIPacket_t ASCIIPacket;
 ElectricAirPacket_t ElectricAirPacket;
 HoTTGeneral_t HoTTGeneral;
+unsigned char SpeakHoTT = SPEAK_MIKROKOPTER;
 int HoTTVarioMeter = 0;
+const char PROGMEM MIKROKOPTER[] =      {"     MikroKopter     "};
 const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17] =
+{
 //0123456789123456
  "No Error        \0",  // 0
  "Not compatible  \0",  // 1
  "SD-Logging error\0",  // 27
  "Flying range!   \0",  // 28
  "Max Altitude!   \0"   // 29
 };
+const char PROGMEM HOTT_ERROR[MAX_ERR_NUMBER][2] =
+{       // 1 -> only in flight   0 -> also on ground
+//0123456789123456
+         {0,0},// "No Error        \0",  // 0
+         {SPEAK_ERROR,0},// "Not compatible  \0",  // 1
+         {SPEAK_ERROR,0},// "MK3Mag not compa\0",  // 2
+         {SPEAK_ERR_NAVI,1},// "No FC communicat\0",  // 3
+         {SPEAK_ERR_COMPASS,1},// "MK3Mag communica\0",  // 4
+         {SPEAK_ERR_GPS,0},// "GPS communicatio\0",  // 5
+         {SPEAK_ERR_COMPASS,1},// "compass value   \0",  // 6
+         {SPEAK_ERR_RECEICER,0},// "RC Signal lost  \0",  // 7
+         {SPEAK_ERR_NAVI,0},// "FC spi rx error \0",  // 8
+         {SPEAK_ERR_NAVI,0},// "No NC communicat\0",  // 9
+         {SPEAK_ERR_SENSOR,0},// "FC Nick Gyro    \0",  // 10
+         {SPEAK_ERR_SENSOR,0},// "FC Roll Gyro    \0",  // 11
+         {SPEAK_ERR_SENSOR,0},// "FC Yaw Gyro     \0",  // 12
+         {SPEAK_ERR_SENSOR,0},// "FC Nick ACC     \0",  // 13
+         {SPEAK_ERR_SENSOR,0},// "FC Roll ACC     \0",  // 14
+         {SPEAK_ERR_SENSOR,0},// "FC Z-ACC        \0",  // 15
+         {SPEAK_ERR_SENSOR,0},// "Pressure sensor \0",  // 16
+         {SPEAK_ERR_DATABUS,1},// "I2C FC->BL-Ctrl \0",  // 17
+         {SPEAK_ERR_DATABUS,1},// "Bl Missing      \0",  // 18
+         {SPEAK_ERROR,0},// "Mixer Error     \0",  // 19
+         {SPEAK_CF_OFF,1},// "Carefree Error  \0",  // 20
+         {SPEAK_GPS_FIX,1},// "GPS Fix lost    \0",  // 21
+         {SPEAK_ERR_COMPASS,0},// "Magnet Error    \0",  // 22
+         {SPEAK_ERR_MOTOR,1},// "Motor restart   \0",  // 23
+         {SPEAK_MAX_TEMPERAT,1},// "BL Limitation   \0",  // 24
+         {SPEAK_MAX_RANGE,1},// "GPS Range       \0",  // 25
+         {SPEAK_ERROR,1},// "No SD-Card      \0",  // 26
+         {SPEAK_ERROR,1},// "SD-Logging error\0",  // 27
+         {SPEAK_MAX_RANGE,1},// "Flying range!   \0",   // 28
+         {SPEAK_MAX_ALTITUD,1}// "Max Altitude!   \0"   // 29
+};
 unsigned char MaxBlTempertaure = 0;
 unsigned char MinBlTempertaure = 0;
 unsigned char HottestBl = 0;
+}
 //---------------------------------------------------------------
 unsigned char HoTT_Waring(void)
+{
+  unsigned char status = 0;
+  static char old_status = 0;
+  static int repeat;
+//SpeakHoTT = 0; // zunächst noch nicht unterstützen
+DebugOut.Analog[16] = 0;
-{
+  if(Parameter_UserParam1) return(Parameter_UserParam1);
+  if(FC_StatusFlags & FC_STATUS_LOWBAT) status = VOICE_MINIMALE_EINGANSSPANNUNG;
+  else
+  if(NC_ErrorCode)
+   {
+    if(MotorenEin || !pgm_read_byte(&HOTT_ERROR[NC_ErrorCode][1])) status = pgm_read_byte(&HOTT_ERROR[NC_ErrorCode][0]);
+   }
+  if(!status) {status = SpeakHoTT; };
+  if(old_status == status)
-  if(FC_StatusFlags & FC_STATUS_LOWBAT) return(VOICE_MINIMALE_EINGANSSPANNUNG);
+   {
+    if(!CheckDelay(repeat)) return(0);
+        repeat = SetDelay(5000);
+   }
+   else repeat = SetDelay(2000);
+  if(status)
+   {
+    if(status == SpeakHoTT) SpeakHoTT = 0;
+   }
+  old_status = status;
-  if(MotorenEin && NC_ErrorCode)                return(VOICE_BEEP);
+DebugOut.Analog[16] = status;
+if(status) DebugOut.Analog[17]++;
-//if(Parameter_UserParam1) return(Parameter_UserParam1);
-  return(0);
+  return(status);
+}
 //---------------------------------------------------------------
 //---------------------------------------------------------------
+unsigned char HoTT_Telemety(unsigned char packet_request)
+{
+unsigned char i;
-unsigned char HoTT_Telemety(unsigned char packet_request)
+  //Debug("rqst: %02X",packet_request);
  switch(packet_request)
+ {
   case HOTT_VARIO_PACKET_ID:
                 VarioPacket.Altitude = HoehenWert/100 + 500;
                 VarioPacket.m_sec = BuildHoTT_Vario();
                 VarioPacket.m_3sec = VarioPacket.m_sec;
                 VarioPacket.m_10sec = VarioPacket.m_sec;
                 if (VarioPacket.Altitude < VarioPacket.MinAltitude) VarioPacket.MinAltitude = VarioPacket.Altitude;
                 if (VarioPacket.Altitude > VarioPacket.MaxAltitude) VarioPacket.MaxAltitude = VarioPacket.Altitude;
+                VarioPacket.WarnBeep = 0;//HoTT_Waring();
+                HoTT_DataPointer = (unsigned char *) &VarioPacket;
+        VarioPacket.FreeCharacters[0] = VarioCharacter;
+    if(FC_StatusFlags2 & FC_STATUS2_CAREFREE) VarioPacket.FreeCharacters[1] = 'C'; else VarioPacket.FreeCharacters[1] = ' ';
+//      VarioPacket.FreeCharacters[2] = ' ';
+    if(NC_ErrorCode)
+         {
+                for(i=0; i<16;i++) VarioPacket.Text[i+4] = pgm_read_byte(&NC_ERROR_TEXT[NC_ErrorCode][i]);
+                VarioPacket.Text[0] = NC_ErrorCode/10 + '0';
+                VarioPacket.Text[1] = NC_ErrorCode%10 + '0';
+                VarioPacket.Text[2] = ':';
+         }
-                VarioPacket.WarnBeep = HoTT_Waring();
+         else for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i]); // no Error
                 HoTT_DataPointer = (unsigned char *) &VarioPacket;
                 return(sizeof(VarioPacket));
                 break;
   case HOTT_GPS_PACKET_ID:
                 GPSPacket.Altitude = HoehenWert/100 + 500;
 //              GPSPacket.Distance = GPSInfo.HomeDistance/10;  // macht die NC
 //              GPSPacket.Heading = GPSInfo.HomeBearing/2;     // macht die NC
 //              GPSPacket.Speed = (GPSInfo.Speed * 36) / 10;   // macht die NC
                 GPSPacket.m_sec = BuildHoTT_Vario();
+                GPSPacket.m_3sec = 120;
+                GPSPacket.NumOfSats = GPSInfo.NumOfSats;
+                GPSPacket.WarnBeep = HoTT_Waring();
+                if(GPSInfo.Flags & FLAG_DIFFSOLN) GPSPacket.SatFix = 'D';
-                GPSPacket.m_3sec = 120;
+                else
+        if(GPSInfo.SatFix == SATFIX_3D) GPSPacket.SatFix = ' ';
+                else GPSPacket.SatFix = '!';
+                HoTT_DataPointer = (unsigned char *) &GPSPacket;
-                GPSPacket.m_10sec = 0;
+                GPSPacket.FreeCharacters[0] = NC_GPS_ModeCharacter;
-                GPSPacket.WarnBeep = HoTT_Waring();
+                GPSPacket.FreeCharacters[2] = GPSPacket.SatFix;
-                HoTT_DataPointer = (unsigned char *) &GPSPacket;
+                GPSPacket.HomeDirection = GPSInfo.HomeBearing / 2;//230;
                 return(sizeof(GPSPacket));
                 break;
                 ElectricAirPacket.m_3sec = 120;
                 ElectricAirPacket.InputVoltage = UBat;
                 ElectricAirPacket.Temperature1 = MinBlTempertaure + 20;
                 ElectricAirPacket.Temperature2 = MaxBlTempertaure + 20;
                 ElectricAirPacket.Capacity = Capacity.UsedCapacity/10;
-                ElectricAirPacket.WarnBeep = HoTT_Waring();
+                ElectricAirPacket.WarnBeep = 0;//HoTT_Waring();
                 ElectricAirPacket.Current = Capacity.ActualCurrent;
                 HoTT_DataPointer = (unsigned char *) &ElectricAirPacket;
+                ElectricAirPacket.FlightTimeMinutes = FlugSekunden / 60;
+                ElectricAirPacket.FlightTimeSeconds = FlugSekunden % 60;
                 return(sizeof(ElectricAirPacket));
                 break;
   case HOTT_GENERAL_PACKET_ID:
                 GetHottestBl();
                 HoTTGeneral.Rpm = GPSInfo.HomeDistance/100;
                 HoTTGeneral.m_3sec = 120;
                 HoTTGeneral.InputVoltage = UBat;
                 HoTTGeneral.Temperature1 = MinBlTempertaure + 20;
                 HoTTGeneral.Temperature2 = MaxBlTempertaure + 20;
                 HoTTGeneral.Capacity = Capacity.UsedCapacity/10;
-                HoTTGeneral.WarnBeep = HoTT_Waring();
+                HoTTGeneral.WarnBeep = 0;//HoTT_Waring();
                 HoTTGeneral.Current = Capacity.ActualCurrent;
                 HoTT_DataPointer = (unsigned char *) &HoTTGeneral;
                 return(sizeof(HoTTGeneral));
                 break;
   default: return(0);
                             HoTT_printfxy(12,5,"HM:%3d%c %c", GPSInfo.HomeBearing, HoTT_GRAD, NC_GPS_ModeCharacter);
                                 HoTT_printfxy(9,5,"incl:%2d%c(%2i)",EarthMagneticInclination, HoTT_GRAD,EarthMagneticInclinationTheoretic);
+              }
                          else
+                          {
-                        //HoTT_printfxy(9,5,":");
                                 HoTT_printfxy(0,5,"    %2um/s:  HM:%3d%c %c",GPSInfo.Speed, GPSInfo.HomeBearing, HoTT_GRAD, NC_GPS_ModeCharacter);
-//                          HoTT_printfxy(11,5,"");
+                          }
+            }
                         else Hott_ClearLine(5);
                         break;
         case 6:
+                                {
                                  HoTT_printfxy(0,7,"ERR: ");     _printf_P(&LIBFC_HoTT_Putchar, NC_ERROR_TEXT[NC_ErrorCode] , 0);};
+                                }
                         else HoTT_printfxy(0,7," www.MikroKopter.de  ");
                         break;
-        case 8: ASCIIPacket.WarnBeep = HoTT_Waring();
+        case 8: //ASCIIPacket.WarnBeep = HoTT_Waring();
                         // ASCIIPacket.WarnBeep = Parameter_UserParam1;
         case 9:
         case 10:
         case 11:
         case 12:
+                                {
                                  HoTT_printfxy(0,7,"ERR: ");     _printf_P(&LIBFC_HoTT_Putchar, NC_ERROR_TEXT[NC_ErrorCode] , 0);};
+                                }
                         else HoTT_printfxy(0,7," www.MikroKopter.de  ");
                         break;
-        case 8: ASCIIPacket.WarnBeep = HoTT_Waring();
+        case 8: // ASCIIPacket.WarnBeep = HoTT_Waring();
                         // ASCIIPacket.WarnBeep = Parameter_UserParam1;
         case 9:
         case 10:
         case 11:
         case 12:
                          if(EE_Parameter.BitConfig & (CFG_LOOP_LINKS | CFG_LOOP_RECHTS | CFG_LOOP_UNTEN | CFG_LOOP_OBEN)) HoTT_printf_BLINK("LOOPING! ");
                          if(Parameter_GlobalConfig & CFG_HEADING_HOLD) HoTT_printf_BLINK("HH! ");
                          if(!(Parameter_GlobalConfig & CFG_KOMPASS_AKTIV)) HoTT_printf_BLINK("COMPASS OFF! ");
+                        }
                         break;
-    case 8: ASCIIPacket.WarnBeep = HoTT_Waring();
+    case 8: //ASCIIPacket.WarnBeep = HoTT_Waring();
                         break;
     case 9:
     case 10:
     case 11:
     case 12:

Subversion Repositories FlightCtrl

(root)/tags/V2.14a/hottmenu.c @ 2719 - Rev 2072 → 2090