WebSVN - FlightCtrl - Diff - Rev 2263 and 2322

 #define HOTT_KEY_DOWN   2
 #define HOTT_KEY_UP     4
 #define HOTT_KEY_SET    6
 #define HOTT_KEY_LEFT   8
 #define VARIO_ZERO 30000
 unsigned char NaviData_WaypointIndex = 0, NaviData_WaypointNumber = 0, NaviData_TargetHoldTime = 0;
 unsigned int NaviData_TargetDistance = 0;
+  }
+}
 unsigned int BuildHoTT_Vario(void)
 {
- unsigned int tmp = 30000;
+ unsigned int tmp = VARIO_ZERO;
  if(VarioCharacter == '+' || VarioCharacter == '-')
   {
-   tmp = 30000 + (AltitudeSetpointTrimming * EE_Parameter.Hoehe_Verstaerkung) / 3;
+   tmp = VARIO_ZERO + (AltitudeSetpointTrimming * EE_Parameter.Hoehe_Verstaerkung) / 3;
-   if(tmp < 30000 && tmp > 30000 - 50) tmp = 30000 - 50; // weil es sonst erst bei < 0,5m/sek piept
+   if(tmp < VARIO_ZERO && tmp > VARIO_ZERO - 50) tmp = VARIO_ZERO - 50; // weil es sonst erst bei < 0,5m/sek piept
+  }
  else
  if((VarioCharacter == ' ') && (FC_StatusFlags & FC_STATUS_FLY))
   {
-   tmp = 30000 + HoTTVarioMeter;
+   tmp = VARIO_ZERO + HoTTVarioMeter;
-   if(tmp > 30000)
+   if(tmp > VARIO_ZERO)
     {
-     if(tmp < 30000 + 100) tmp = 30000;
+     if(tmp < VARIO_ZERO + 100) tmp = VARIO_ZERO;
          else tmp -= 100;
         }
-   if(tmp < 30000)
+   if(tmp < VARIO_ZERO)
     {
-     if(tmp > 30000 - 100) tmp = 30000;
+     if(tmp > VARIO_ZERO - 100) tmp = VARIO_ZERO;
          else tmp += 100;
+        }
+  }
  else
- if(VarioCharacter == '^') tmp = 30000 + FromNC_AltitudeSpeed * 10;
+ if(VarioCharacter == '^') tmp = VARIO_ZERO + FromNC_AltitudeSpeed * 10;
  else
- if(VarioCharacter == 'v') tmp = 30000 - FromNC_AltitudeSpeed * 10;
  if(VarioCharacter == 'v') tmp = VARIO_ZERO - FromNC_AltitudeSpeed * 10;
  return(tmp);
+}
 //---------------------------------------------------------------
 unsigned char HoTT_Telemety(unsigned char packet_request)
+{
-unsigned char i;
-  //Debug("rqst: %02X",packet_request);
+ unsigned char i;
   //Debug("rqst: %02X",packet_request);
  switch(packet_request)
+ {
   case HOTT_VARIO_PACKET_ID:
-  case HOTT_VARIO_PACKET_ID:
+                GPSPacket.WarnBeep = HoTT_Waring(); // Achtung: das ist richtig hier, damit der Varioton schon vorher abgestellt wird
                 VarioPacket.Altitude = HoehenWert/100 + 500;
-                VarioPacket.m_sec = BuildHoTT_Vario();
+                if(!GPSPacket.WarnBeep) 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;
 //unsigned char NaviData_WaypointIndex = 0, NaviData_WaypointNumber = 0, NaviData_TargetHoldTime = 0;
 //unsigned int NaviData_TargetDistance = 0;
+         }
          else
          for(i=0; i<21;i++) VarioPacket.Text[i] = pgm_read_byte(&MIKROKOPTER[i]); // no Error
                 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.Speed = (GPSInfo.Speed * 36) / 10;   // macht die NC
+//      GPSPacket.WarnBeep = HoTT_Waring();                //(wird jetzt weiter oben gemacht)
-                GPSPacket.m_sec = BuildHoTT_Vario();
+                if(!GPSPacket.WarnBeep) GPSPacket.m_sec = BuildHoTT_Vario(); else GPSPacket.m_sec = VARIO_ZERO;
                 GPSPacket.m_3sec = 120;
-                GPSPacket.NumOfSats = GPSInfo.NumOfSats;
-                GPSPacket.WarnBeep = HoTT_Waring();
+                GPSPacket.NumOfSats = GPSInfo.NumOfSats;
                 if(GPSInfo.Flags & FLAG_DIFFSOLN) GPSPacket.SatFix = 'D';
                 else
         if(GPSInfo.SatFix == SATFIX_3D) GPSPacket.SatFix = ' ';
                 else GPSPacket.SatFix = '!';
                 ElectricAirPacket.VoltageCell8 = ElectricAirPacket.VoltageCell1;
                 ElectricAirPacket.VoltageCell6 = GPSInfo.HomeBearing / 2;
                 ElectricAirPacket.VoltageCell7 = GPSInfo.HomeDistance/20;
                 ElectricAirPacket.VoltageCell13 = ElectricAirPacket.VoltageCell6;
                 ElectricAirPacket.VoltageCell14 = ElectricAirPacket.VoltageCell7;
-                ElectricAirPacket.m_sec = BuildHoTT_Vario();
+        if(!GPSPacket.WarnBeep) ElectricAirPacket.m_sec = BuildHoTT_Vario(); else ElectricAirPacket.m_sec = VARIO_ZERO;
                 ElectricAirPacket.m_3sec = 120;
                 ElectricAirPacket.InputVoltage = UBat;
                 ElectricAirPacket.Temperature1 = MinBlTempertaure + 20;
                 ElectricAirPacket.Temperature2 = MaxBlTempertaure + 20;
                 ElectricAirPacket.Capacity = Capacity.UsedCapacity/10;
                 HoTTGeneral.FuelCapacity = HoehenWert/100;
                 if(HoTTGeneral.FuelCapacity < 0) HoTTGeneral.FuelCapacity = 0;
                 HoTTGeneral.Altitude = HoehenWert/100 + 500;
                 HoTTGeneral.Battery1 = UBat;
                 HoTTGeneral.Battery2 = UBat;
-                HoTTGeneral.m_sec =  BuildHoTT_Vario();
+                if(!GPSPacket.WarnBeep) HoTTGeneral.m_sec =  BuildHoTT_Vario(); else  HoTTGeneral.m_sec = VARIO_ZERO;
                 HoTTGeneral.m_3sec = 120;
                 HoTTGeneral.InputVoltage = UBat;
                 HoTTGeneral.Temperature1 = MinBlTempertaure + 20;
                 HoTTGeneral.Temperature2 = MaxBlTempertaure + 20;
                 HoTTGeneral.Capacity = Capacity.UsedCapacity/10;

Subversion Repositories FlightCtrl

(root)/tags/V2.16a/hottmenu.c @ 2719 - Rev 2263 → 2322