WebSVN - FlightCtrl - Diff - Rev 2426 and 2437



  case HOTT_ELECTRIC_AIR_PACKET_ID:
                GetHottestBl();
                ElectricAirPacket.Altitude = HoehenWert/100 + 500;
                ElectricAirPacket.Battery1 = UBat;
                ElectricAirPacket.Battery2 = UBat;
                ElectricAirPacket.VoltageCell1 = CompassCorrected / 2;
                ElectricAirPacket.VoltageCell8 = ElectricAirPacket.VoltageCell1;
                ElectricAirPacket.VoltageCell6 = GPSInfo.HomeBearing / 2;
                ElectricAirPacket.VoltageCell7 = GPSInfo.HomeDistance/20;
                ElectricAirPacket.VoltageCell13 = ElectricAirPacket.VoltageCell6;
                ElectricAirPacket.VoltageCell14 = ElectricAirPacket.VoltageCell7;

                return(sizeof(ElectricAirPacket));
                break;
  case HOTT_GENERAL_PACKET_ID:
                GetHottestBl();
                HoTTGeneral.Rpm = GPSInfo.HomeDistance/100;
                HoTTGeneral.VoltageCell1 = CompassCorrected / 2;
                HoTTGeneral.VoltageCell2 = KompassValue / 2;
                //HoTTGeneral.VoltageCell3 = Magnetstaerke -> macht NC
                //HoTTGeneral.VoltageCell4 = Inclinition -> macht NC
                HoTTGeneral.VoltageCell5 = DebugOut.Analog[28]; // I2C ErrorCounter
                HoTTGeneral.VoltageCell6 = GPSInfo.HomeBearing / 2;

                        break;
        case 1:  
                if(FC_StatusFlags & FC_STATUS_LOWBAT)
                         HoTT_printfxy_BLINK(0,1,"  %2i:%02i  ",FlugSekunden/60,FlugSekunden%60)
            else   HoTT_printfxy(0,1,"  %2i:%02i  ",FlugSekunden/60,FlugSekunden%60);                      
                        HoTT_printfxy(10,1,"DIR: %3d%c",CompassCorrected, HoTT_GRAD);
                        if(FC_StatusFlags2 & FC_STATUS2_CAREFREE) HoTT_printfxy_INV(20,1,"C") else HoTT_printfxy(20,1," ");
            break;
        case 2:
                if(FC_StatusFlags & FC_STATUS_LOWBAT)
                         HoTT_printfxy_BLINK(0,2,"  %5i  ",Capacity.UsedCapacity)

                if(FC_StatusFlags & FC_STATUS_LOWBAT)
                         HoTT_printfxy_BLINK(0,0," %2i:%02i  %2i.%1iV %4imAh",FlugSekunden/60,FlugSekunden%60,UBat/10, UBat%10,Capacity.UsedCapacity)
            else   HoTT_printfxy(0,0," %2i:%02i  %2i.%1iV %4imAh",FlugSekunden/60,FlugSekunden%60,UBat/10, UBat%10,Capacity.UsedCapacity);                         
                        break;
        case 1:  
                        HoTT_printfxy(0,1,"DIR:%3d%c",CompassCorrected, HoTT_GRAD);
                        if(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)
                          {
                           if(HoehenReglerAktiv)        HoTT_printfxy_INV(10,1,"ALT:%4im", (int16_t)(HoehenWert/100))
                           else                                         HoTT_printfxy(10,1,"ALT:%4im", (int16_t)(HoehenWert/100))
                           }

Subversion Repositories FlightCtrl

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

Rev 2426		Rev 2437
Line 448...		Line 448...
448	case HOTT_ELECTRIC_AIR_PACKET_ID:	448	case HOTT_ELECTRIC_AIR_PACKET_ID:
449	GetHottestBl();	449	GetHottestBl();
450	ElectricAirPacket.Altitude = HoehenWert/100 + 500;	450	ElectricAirPacket.Altitude = HoehenWert/100 + 500;
451	ElectricAirPacket.Battery1 = UBat;	451	ElectricAirPacket.Battery1 = UBat;
452	ElectricAirPacket.Battery2 = UBat;	452	ElectricAirPacket.Battery2 = UBat;
453	ElectricAirPacket.VoltageCell1 = ErsatzKompassInGrad / 2;	453	ElectricAirPacket.VoltageCell1 = CompassCorrected / 2;
454	ElectricAirPacket.VoltageCell8 = ElectricAirPacket.VoltageCell1;	454	ElectricAirPacket.VoltageCell8 = ElectricAirPacket.VoltageCell1;
455	ElectricAirPacket.VoltageCell6 = GPSInfo.HomeBearing / 2;	455	ElectricAirPacket.VoltageCell6 = GPSInfo.HomeBearing / 2;
456	ElectricAirPacket.VoltageCell7 = GPSInfo.HomeDistance/20;	456	ElectricAirPacket.VoltageCell7 = GPSInfo.HomeDistance/20;
457	ElectricAirPacket.VoltageCell13 = ElectricAirPacket.VoltageCell6;	457	ElectricAirPacket.VoltageCell13 = ElectricAirPacket.VoltageCell6;
458	ElectricAirPacket.VoltageCell14 = ElectricAirPacket.VoltageCell7;	458	ElectricAirPacket.VoltageCell14 = ElectricAirPacket.VoltageCell7;
Line 471...		Line 471...
471	return(sizeof(ElectricAirPacket));	471	return(sizeof(ElectricAirPacket));
472	break;	472	break;
473	case HOTT_GENERAL_PACKET_ID:	473	case HOTT_GENERAL_PACKET_ID:
474	GetHottestBl();	474	GetHottestBl();
475	HoTTGeneral.Rpm = GPSInfo.HomeDistance/100;	475	HoTTGeneral.Rpm = GPSInfo.HomeDistance/100;
476	HoTTGeneral.VoltageCell1 = ErsatzKompassInGrad / 2;	476	HoTTGeneral.VoltageCell1 = CompassCorrected / 2;
477	HoTTGeneral.VoltageCell2 = KompassValue / 2;	477	HoTTGeneral.VoltageCell2 = KompassValue / 2;
478	//HoTTGeneral.VoltageCell3 = Magnetstaerke -> macht NC	478	//HoTTGeneral.VoltageCell3 = Magnetstaerke -> macht NC
479	//HoTTGeneral.VoltageCell4 = Inclinition -> macht NC	479	//HoTTGeneral.VoltageCell4 = Inclinition -> macht NC
480	HoTTGeneral.VoltageCell5 = DebugOut.Analog[28]; // I2C ErrorCounter	480	HoTTGeneral.VoltageCell5 = DebugOut.Analog[28]; // I2C ErrorCounter
481	HoTTGeneral.VoltageCell6 = GPSInfo.HomeBearing / 2;	481	HoTTGeneral.VoltageCell6 = GPSInfo.HomeBearing / 2;
Line 533...		Line 533...
533	break;	533	break;
534	case 1:	534	case 1:
535	if(FC_StatusFlags & FC_STATUS_LOWBAT)	535	if(FC_StatusFlags & FC_STATUS_LOWBAT)
536	HoTT_printfxy_BLINK(0,1," %2i:%02i ",FlugSekunden/60,FlugSekunden%60)	536	HoTT_printfxy_BLINK(0,1," %2i:%02i ",FlugSekunden/60,FlugSekunden%60)
537	else HoTT_printfxy(0,1," %2i:%02i ",FlugSekunden/60,FlugSekunden%60);	537	else HoTT_printfxy(0,1," %2i:%02i ",FlugSekunden/60,FlugSekunden%60);
538	HoTT_printfxy(10,1,"DIR: %3d%c",ErsatzKompassInGrad, HoTT_GRAD);	538	HoTT_printfxy(10,1,"DIR: %3d%c",CompassCorrected, HoTT_GRAD);
539	if(FC_StatusFlags2 & FC_STATUS2_CAREFREE) HoTT_printfxy_INV(20,1,"C") else HoTT_printfxy(20,1," ");	539	if(FC_StatusFlags2 & FC_STATUS2_CAREFREE) HoTT_printfxy_INV(20,1,"C") else HoTT_printfxy(20,1," ");
540	break;	540	break;
541	case 2:	541	case 2:
542	if(FC_StatusFlags & FC_STATUS_LOWBAT)	542	if(FC_StatusFlags & FC_STATUS_LOWBAT)
543	HoTT_printfxy_BLINK(0,2," %5i ",Capacity.UsedCapacity)	543	HoTT_printfxy_BLINK(0,2," %5i ",Capacity.UsedCapacity)
Line 634...		Line 634...
634	if(FC_StatusFlags & FC_STATUS_LOWBAT)	634	if(FC_StatusFlags & FC_STATUS_LOWBAT)
635	HoTT_printfxy_BLINK(0,0," %2i:%02i %2i.%1iV %4imAh",FlugSekunden/60,FlugSekunden%60,UBat/10, UBat%10,Capacity.UsedCapacity)	635	HoTT_printfxy_BLINK(0,0," %2i:%02i %2i.%1iV %4imAh",FlugSekunden/60,FlugSekunden%60,UBat/10, UBat%10,Capacity.UsedCapacity)
636	else HoTT_printfxy(0,0," %2i:%02i %2i.%1iV %4imAh",FlugSekunden/60,FlugSekunden%60,UBat/10, UBat%10,Capacity.UsedCapacity);	636	else HoTT_printfxy(0,0," %2i:%02i %2i.%1iV %4imAh",FlugSekunden/60,FlugSekunden%60,UBat/10, UBat%10,Capacity.UsedCapacity);
637	break;	637	break;
638	case 1:	638	case 1:
639	HoTT_printfxy(0,1,"DIR:%3d%c",KompassValue, HoTT_GRAD);	639	HoTT_printfxy(0,1,"DIR:%3d%c",CompassCorrected, HoTT_GRAD);
640	if(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)	640	if(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)
641	{	641	{
642	if(HoehenReglerAktiv) HoTT_printfxy_INV(10,1,"ALT:%4im", (int16_t)(HoehenWert/100))	642	if(HoehenReglerAktiv) HoTT_printfxy_INV(10,1,"ALT:%4im", (int16_t)(HoehenWert/100))
643	else HoTT_printfxy(10,1,"ALT:%4im", (int16_t)(HoehenWert/100))	643	else HoTT_printfxy(10,1,"ALT:%4im", (int16_t)(HoehenWert/100))
644	}	644	}