WebSVN - FlightCtrl - Diff - Rev 1943 and 1944

 GPSPacket_t GPSPacket;
 VarioPacket_t VarioPacket;
 ASCIIPacket_t ASCIIPacket;
 ElectricAirPacket_t ElectricAirPacket;
 HoTTGeneral_t HoTTGeneral;
+int HoTTVarioMeter = 0;
 const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17] =
+{
 //0123456789123456
  "Pressure sensor \0",  // 16
  "I2C FC->BL-Ctrl \0",  // 17
  "Bl Missing      \0",  // 18
  "Mixer Error     \0",  // 19
  "Carefree Error  \0",  // 20
- "GPS Fix lost    \0"   // 21
+ "GPS Fix lost    \0",  // 21
+ "Magnet Error    \0"   // 22
 };
 unsigned char MaxBlTempertaure = 0;
 unsigned char MinBlTempertaure = 0;
+  }
+}
 unsigned int BuildHoTT_Vario(void)
 {
- unsigned int tmp;
+ unsigned int tmp = 30000;
- if(WaypointTrimming == 0)
+ if(VarioCharacter == '+' || VarioCharacter == '-')
- {
+  {
-  tmp = 30000 + (AltitudeSetpointTrimming * EE_Parameter.Hoehe_Verstaerkung) / 3;
+   tmp = 30000 + (AltitudeSetpointTrimming * EE_Parameter.Hoehe_Verstaerkung) / 3;
-  if(tmp < 30000 && tmp > 30000 - 50) tmp = 30000 - 50; // weil es erst bei < 0,5m/sek piept
+   if(tmp < 30000 && tmp > 30000 - 50) tmp = 30000 - 50; // weil es sonst erst bei < 0,5m/sek piept
+  }
  else
+ if((VarioCharacter == ' ') && (FC_StatusFlags & FC_STATUS_FLY))
+  {
+   tmp = 30000 + HoTTVarioMeter;
+   if(tmp > 30000)
+    {
+     if(tmp < 30000 + 100) tmp = 30000;
+         else tmp -= 100;
+        }
+   if(tmp < 30000)
+    {
+     if(tmp > 30000 - 100) tmp = 30000;
+         else tmp += 100;
+        }
+  }
- if(WaypointTrimming > 0) tmp = 30000 + FromNC_AltitudeSpeed * 10;
+ else
+ if(VarioCharacter == '^') tmp = 30000 + FromNC_AltitudeSpeed * 10;
- else tmp = 30000 - FromNC_AltitudeSpeed * 10;
+ else
+ if(VarioCharacter == 'v') tmp = 30000 - FromNC_AltitudeSpeed * 10;
 //tmp = 30000 + (int)(PPM_in[EE_Parameter.Kanalbelegung[K_GAS]]) * 5;
  return(tmp);
+}
                 ElectricAirPacket.Altitude = HoehenWert/100 + 500;
                 ElectricAirPacket.Battery1 = UBat;
                 ElectricAirPacket.Battery2 = UBat;
                 ElectricAirPacket.VoltageCell1 = ErsatzKompassInGrad / 2;
                 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();
                 ElectricAirPacket.m_3sec = 120;
                 ElectricAirPacket.InputVoltage = UBat;
                 ElectricAirPacket.Temperature1 = MinBlTempertaure + 20;
                 break;
   case HOTT_GENERAL_PACKET_ID:
                 GetHottestBl();
                 HoTTGeneral.Rpm = GPSInfo.HomeDistance/100;
                 HoTTGeneral.VoltageCell1 = ErsatzKompassInGrad / 2;
-                HoTTGeneral.VoltageCell5 = GPSInfo.HomeDistance/20;
+                HoTTGeneral.VoltageCell6 = GPSInfo.HomeBearing / 2;
                 if(UBat > BattLowVoltageWarning + 5) HoTTGeneral.FuelPercent = (UBat - (BattLowVoltageWarning + 6)) * 3;
                 else HoTTGeneral.FuelPercent = 0;
-                HoTTGeneral.FuelCapacity = HoehenWert/100; ;
+                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();
                 HoTTGeneral.m_3sec = 120;
 //---------------------------------------------------------------
 void HoTT_Menu(void)
+{
  static unsigned char line, page = 0;
  unsigned char tmp;
+ HoTTVarioMeter = (HoTTVarioMeter * 7 + VarioMeter) / 8;
  if(page == 0)
   switch(line++)
+  {
         case 0:
                 if(FC_StatusFlags & FC_STATUS_LOWBAT)
                                                 HoTT_printfxy_BLINK(7,4,"!!");
                                                 break;
+                                }
+                        }
                         else
-                        {                    //012345678901234567890
+                        {
                                 Hott_ClearLine(4);
+                        }
                         break;
         case 5:
                         if(NaviDataOkay)
                             HoTT_printfxy(12,5,"HM:%3d%c %c", GPSInfo.HomeBearing, HoTT_GRAD, NC_GPS_ModeCharacter);
+            }
                         else Hott_ClearLine(5);
                         break;
         case 6:
-/*
-                    if(RequiredMotors == 4) Hott_ClearLine(6);
-                                else
-                                if(RequiredMotors == 6)  HoTT_printfxy(0,6,"%3i %3i%cC        ", Motor[4].Temperature, Motor[5].Temperature,HoTT_GRAD)
-                                else
-                                if(RequiredMotors > 6)   HoTT_printfxy(0,6,"%3i %3i %3i %3i%cC", Motor[4].Temperature, Motor[5].Temperature, Motor[6].Temperature, Motor[7].Temperature,HoTT_GRAD);
-//HoTT_printfxy(15,6,"%KEY:%02x",HottKeyboard);
-*/
                         break;
         case 7: if(NC_ErrorCode)
+                  {
                            if(HoTTBlink && NC_ErrorCode < MAX_ERR_NUMBER)
+                            {

Subversion Repositories FlightCtrl

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