WebSVN - FlightCtrl - Diff - Rev 2527 and 2531

  "Max Altitude!   \0",  // 29
  "No GPS fix      \0",  // 30
  "compass not cal.\0",  // 31
  "BL-Selftest     \0",  // 32
  "no ext. compass \0",  // 33
- "compass sensor  \0"   // 34
+ "compass sensor  \0",  // 34
+ "Failsafe postion\0",  // 35
+ "No Redundancy!  \0",  // 36
+ "Redundancy test \0"   // 37
 };
 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},               // "Not compatible  \0",        // 1
-         {SPEAK_ERROR,0},               // "MK3Mag not compa\0",  // 2
+         {SPEAK_ERROR,0},               // "MK3Mag not compa\0",        // 2
-         {SPEAK_ERR_NAVI,1},    // "No FC communicat\0",  // 3
+         {SPEAK_ERR_NAVI,1},    // "No FC communicat\0",        // 3
-         {SPEAK_ERR_COMPASS,1}, // "MK3Mag communica\0",  // 4
+         {SPEAK_ERR_COMPASS,1}, // "MK3Mag communica\0",        // 4
-         {SPEAK_ERR_GPS,0},             // "GPS communicatio\0",  // 5
+         {SPEAK_ERR_GPS,0},             // "GPS communicatio\0",        // 5
-         {SPEAK_ERR_COMPASS,1}, // "compass value   \0",  // 6
+         {SPEAK_ERR_COMPASS,1}, // "compass value   \0",        // 6
-         {SPEAK_ERR_RECEICER,0},// "RC Signal lost  \0",  // 7
+         {SPEAK_ERR_RECEICER,0},// "RC Signal lost  \0",        // 7
-         {SPEAK_ERR_NAVI,0},    // "FC spi rx error \0",  // 8
+         {SPEAK_ERR_NAVI,0},    // "FC spi rx error \0",        // 8
-         {SPEAK_ERR_NAVI,0},    // "No NC communicat\0",  // 9
+         {SPEAK_ERR_NAVI,0},    // "No NC communicat\0",        // 9
-         {SPEAK_ERR_SENSOR,0},  // "FC Nick Gyro    \0",  // 10
+         {SPEAK_ERR_SENSOR,0},  // "FC Nick Gyro    \0",        // 10
-         {SPEAK_ERR_SENSOR,0},  // "FC Roll Gyro    \0",  // 11
+         {SPEAK_ERR_SENSOR,0},  // "FC Roll Gyro    \0",        // 11
-         {SPEAK_ERR_SENSOR,0},  // "FC Yaw Gyro     \0",  // 12
+         {SPEAK_ERR_SENSOR,0},  // "FC Yaw Gyro     \0",        // 12
-         {SPEAK_ERR_SENSOR,0},  // "FC Nick ACC     \0",  // 13
+         {SPEAK_ERR_SENSOR,0},  // "FC Nick ACC     \0",        // 13
-         {SPEAK_ERR_SENSOR,0},  // "FC Roll ACC     \0",  // 14
+         {SPEAK_ERR_SENSOR,0},  // "FC Roll ACC     \0",        // 14
-         {SPEAK_ERR_SENSOR,0},  // "FC Z-ACC        \0",  // 15
+         {SPEAK_ERR_SENSOR,0},  // "FC Z-ACC        \0",        // 15
-         {SPEAK_ERR_SENSOR,0},  // "Pressure sensor \0",  // 16
+         {SPEAK_ERR_SENSOR,0},  // "Pressure sensor \0",        // 16
-         {SPEAK_ERR_DATABUS,1}, // "I2C FC->BL-Ctrl \0",  // 17
+         {SPEAK_ERR_DATABUS,1}, // "I2C FC->BL-Ctrl \0",        // 17
-         {SPEAK_ERR_DATABUS,1}, // "Bl Missing      \0",  // 18
+         {SPEAK_ERR_DATABUS,1}, // "Bl Missing      \0",        // 18
-         {SPEAK_ERROR,0},               // "Mixer Error     \0",  // 19
+         {SPEAK_ERROR,0},               // "Mixer Error     \0",        // 19
-         {SPEAK_CF_OFF,1},              // "Carefree Error  \0",  // 20
+         {SPEAK_CF_OFF,1},              // "Carefree Error  \0",        // 20
-         {SPEAK_GPS_FIX,1},             // "GPS Fix lost    \0",  // 21
+         {SPEAK_GPS_FIX,1},             // "GPS Fix lost    \0",        // 21
-         {SPEAK_ERR_COMPASS,0}, // "Magnet Error    \0",  // 22
+         {SPEAK_ERR_COMPASS,0}, // "Magnet Error    \0",        // 22
-         {SPEAK_ERR_MOTOR,1},   // "Motor restart   \0",  // 23
+         {SPEAK_ERR_MOTOR,1},   // "Motor restart   \0",        // 23
-         {SPEAK_MAX_TEMPERAT,1},// "BL Limitation   \0",  // 24
+         {SPEAK_MAX_TEMPERAT,1},// "BL Limitation   \0",        // 24
-         {SPEAK_MAX_RANGE,1},   // "GPS Range       \0",  // 25
+         {SPEAK_MAX_RANGE,1},   // "GPS Range       \0",        // 25
-         {SPEAK_ERROR,1},               // "No SD-Card      \0",  // 26
+         {SPEAK_ERROR,1},               // "No SD-Card      \0",        // 26
-         {SPEAK_ERROR,1},               // "SD-Logging error\0",  // 27
+         {SPEAK_ERROR,1},               // "SD-Logging error\0",        // 27
-         {SPEAK_MAX_RANGE,1},   // "Flying range!   \0",  // 28
+         {SPEAK_MAX_RANGE,1},   // "Flying range!   \0",        // 28
-         {SPEAK_MAX_ALTITUD,1}, // "Max Altitude!   \0"   // 29
+         {SPEAK_MAX_ALTITUD,1}, // "Max Altitude!   \0"         // 29
-         {SPEAK_GPS_FIX,1},             // "No GPS fix      \0"   // 30
+         {SPEAK_GPS_FIX,1},             // "No GPS fix      \0"         // 30
-         {SPEAK_ERR_CALIBARTION,0},// "compass not cal." // 31
+         {SPEAK_ERR_CALIBARTION,0},// "compass not cal."        // 31
-         {SPEAK_ERR_MOTOR,0},   // "BL-Selftest     \0"   // 32
+         {SPEAK_ERR_MOTOR,0},   // "BL-Selftest     \0"         // 32
+         {SPEAK_ERR_COMPASS,0}, // "no ext. compass"            // 33
+         {SPEAK_ERR_COMPASS,0}, // "compass sensor"             // 34
+         {SPEAK_ERROR,1},               // "Failsafe postion0",         // 35
-         {SPEAK_ERR_COMPASS,0}, // "no ext. compass"     // 33
+         {SPEAK_ERROR,0},               // "No Redundancy!",            // 36
-         {SPEAK_ERR_COMPASS,0}  // "compass sensor"      // 34
+         {0,0}                                  // "Redundancy test",           // 37
 };
 unsigned char HoTT_Waring(void)
+{
   unsigned char status = 0;
   static char old_status = 0;
   static int repeat;
-//if(Parameter_UserParam1) return(Parameter_UserParam1);
+//if(Parameter_UserParam1) SpeakHoTT = Parameter_UserParam1;
   ToNC_SpeakHoTT = SpeakHoTT;
   if(FC_StatusFlags & FC_STATUS_LOWBAT)
+   {
     if(LowVoltageLandingActive && (EE_Parameter.Receiver == RECEIVER_HOTT)) status = SPEAK_LANDING;
         else status = VOICE_MINIMALE_EINGANSSPANNUNG; // Jeti hat kein wort: "LANDEN"
 //---------------------------------------------------------------
 unsigned char HoTT_Telemety(unsigned char packet_request)
+{
+ unsigned char i = 0;
- unsigned char i = 0;
+ static unsigned char SpeechMessage = 0;
   //Debug("rqst: %02X",packet_request);
  switch(packet_request)
  {
+  case HOTT_VARIO_PACKET_ID:
-  case HOTT_VARIO_PACKET_ID:
+                if(GPSPacket.WarnBeep == SpeechMessage) SpeechMessage = HoTT_Waring(); // Achtung: das ist richtig hier, damit der Varioton schon vorher abgestellt wird
-                GPSPacket.WarnBeep = HoTT_Waring(); // Achtung: das ist richtig hier, damit der Varioton schon vorher abgestellt wird
                 VarioPacket.Altitude = HoehenWert/100 + 500;
-                if(!GPSPacket.WarnBeep) VarioPacket.m_sec = BuildHoTT_Vario(); else VarioPacket.m_sec = VARIO_ZERO;
+                if(!SpeechMessage) VarioPacket.m_sec = BuildHoTT_Vario(); else VarioPacket.m_sec = VARIO_ZERO;
                 VarioPacket.m_3sec = VarioPacket.m_sec;
                 VarioPacket.m_10sec = VarioPacket.m_sec;
                 if (VarioPacket.Altitude < VarioPacket.MinAltitude) VarioPacket.MinAltitude = VarioPacket.Altitude;
+         }
          else
+         {
           if(FC_StatusFlags3 & FC_STATUS3_BOAT) for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&BOAT_MODE[i]); // no Error
           else  for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i]); // no Error
-          if(FC_StatusFlags3 & FC_STATUS3_REDUNDANCE)  VarioPacket.Text[0] = 'R';
+          if(FC_StatusFlags3 & FC_STATUS3_REDUNDANCE_AKTIVE)  VarioPacket.Text[0] = 'R';
+         }
                 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.WarnBeep = HoTT_Waring();                //(wird jetzt weiter oben gemacht)
+                GPSPacket.WarnBeep = SpeechMessage;
                 if(!GPSPacket.WarnBeep) GPSPacket.m_sec = BuildHoTT_Vario(); else GPSPacket.m_sec = VARIO_ZERO;
                 GPSPacket.m_3sec = 120;
                 GPSPacket.NumOfSats = GPSInfo.NumOfSats;
                 if(GPSInfo.Flags & FLAG_DIFFSOLN) GPSPacket.SatFix = 'D';
                 ElectricAirPacket.VoltageCell8 = ElectricAirPacket.VoltageCell1;
                 ElectricAirPacket.VoltageCell6 = GPSInfo.HomeBearing / 2;
                 ElectricAirPacket.VoltageCell7 = GPSInfo.HomeDistance/20;
                 ElectricAirPacket.VoltageCell13 = ElectricAirPacket.VoltageCell6;
                 ElectricAirPacket.VoltageCell14 = ElectricAirPacket.VoltageCell7;
-        if(!GPSPacket.WarnBeep) ElectricAirPacket.m_sec = BuildHoTT_Vario(); else ElectricAirPacket.m_sec = VARIO_ZERO;
+        if(!SpeechMessage) ElectricAirPacket.m_sec = BuildHoTT_Vario(); else ElectricAirPacket.m_sec = VARIO_ZERO;
                 ElectricAirPacket.m_3sec = 120;
                 ElectricAirPacket.InputVoltage = UBat;
                 ElectricAirPacket.Temperature1 = MinBlTemperture + 20;
                 ElectricAirPacket.Temperature2 = MaxBlTemperture + 20;
                 ElectricAirPacket.Capacity = Capacity.UsedCapacity/10;
-//              ElectricAirPacket.WarnBeep = 0;//HoTT_Waring();
+                ElectricAirPacket.WarnBeep = 0;//HoTT_Waring();
-ElectricAirPacket.WarnBeep = GPSPacket.WarnBeep;
+//ElectricAirPacket.WarnBeep = SpeechMessage;
                 ElectricAirPacket.Current = Capacity.ActualCurrent;
                 HoTT_DataPointer = (unsigned char *) &ElectricAirPacket;
                 ElectricAirPacket.FlightTimeMinutes = FlugSekunden / 60;
                 ElectricAirPacket.FlightTimeSeconds = FlugSekunden % 60;
                 return(sizeof(ElectricAirPacket));
                 HoTTGeneral.FuelCapacity = NC_ErrorCode;//HoehenWert/100; // Oelpegel
 //              if(HoTTGeneral.FuelCapacity < 0) HoTTGeneral.FuelCapacity = 0;
                 HoTTGeneral.Altitude = HoehenWert/100 + 500;
                 HoTTGeneral.Battery1 = UBat;
                 HoTTGeneral.Battery2 = UBat;
-                if(!GPSPacket.WarnBeep) HoTTGeneral.m_sec =  BuildHoTT_Vario(); else  HoTTGeneral.m_sec = VARIO_ZERO;
+                if(!SpeechMessage) HoTTGeneral.m_sec =  BuildHoTT_Vario(); else  HoTTGeneral.m_sec = VARIO_ZERO;
-                HoTTGeneral.m_3sec = 120 + GPSPacket.WarnBeep;
+                HoTTGeneral.m_3sec = 120 + SpeechMessage;
                 HoTTGeneral.InputVoltage = UBat;
                 HoTTGeneral.Temperature1 = MinBlTemperture + 20;
                 HoTTGeneral.Temperature2 = MaxBlTemperture + 20;
                 HoTTGeneral.Capacity = Capacity.UsedCapacity/10;
-                HoTTGeneral.WarnBeep = 0;//HoTT_Waring();
+HoTTGeneral.WarnBeep = 0;
                 HoTTGeneral.Current = Capacity.ActualCurrent;
 //HoTTGeneral.ErrorNumber = HoTTErrorCode();
                 HoTT_DataPointer = (unsigned char *) &HoTTGeneral;
                 return(sizeof(HoTTGeneral));
                 break;

Subversion Repositories FlightCtrl

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