Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2760 → Rev 2761

/trunk/fc.c
92,7 → 92,7
unsigned char TrichterFlug = 0;
long Umschlag180Nick = 250000L, Umschlag180Roll = 250000L;
long ErsatzKompass;
int ErsatzKompassInGrad, CompassCorrected; // Kompasswert in Grad
int ErsatzKompassInGrad, CompassCorrected, OrientationCompassCorrected; // Kompasswert in Grad
int GierGyroFehler = 0;
char GyroFaktor,GyroFaktorGier;
char IntegralFaktor,IntegralFaktorGier;
/trunk/fc.h
98,7 → 98,7
extern unsigned char ControlHeading;
extern int TrimNick, TrimRoll;
extern long ErsatzKompass;
extern int ErsatzKompassInGrad,CompassCorrected; // Kompasswert in Grad
extern int ErsatzKompassInGrad,CompassCorrected,OrientationCompassCorrected; // Kompasswert in Grad
extern long HoehenWert;
extern long SollHoehe;
extern long FromNC_AltitudeSetpoint;
/trunk/hottmenu.c
617,6 → 617,13
{
static unsigned char SpeechMessage = 0;
//Debug("rqst: %02X",packet_request);
//FreeCharacter:1 VarioCharacter --> (+)Steigen (-)Sinken (=)Halten (^)SteigenWaypoint (v)SinkenWaypoint
//FreeCharacter:2 (C) CareFree active
//FreeCharacter:3 ---
//FreeCharacter:4 GPS-Mode --> (P)PositionHold (M)ManuellerFlug (H)ComingHome (F)Failsafe (D)DynamicHold (W)Waypoint (M)ManuellerFlug (-)KeinGPS
//FreeCharacter:5 Camera --> (R)Record (P)Photo (?)Disconnected (!)CameraOff (0-9)PhotoCounter
//FreeCharacter:6 Satfix --> (D)DGPS/SBAS ( )NormalFix (!)KeinFix
 
switch(packet_request)
{
case HOTT_VARIO_PACKET_ID:
655,9 → 662,9
if(GPSPacket.SatFix != '!' && NMEA_In_Fix_Character) GPSPacket.SatFix = NMEA_In_Fix_Character; // external GPS via NMEA
 
HoTT_DataPointer = (unsigned char *) &GPSPacket;
GPSPacket.FreeCharacters[0] = NC_GPS_ModeCharacter;
GPSPacket.FreeCharacters[1] = CamCtrlCharacter;
GPSPacket.FreeCharacters[2] = GPSPacket.SatFix;
GPSPacket.FreeCharacters[0] = NC_GPS_ModeCharacter; // HOTT:4
GPSPacket.FreeCharacters[1] = CamCtrlCharacter; // HOTT:5
GPSPacket.FreeCharacters[2] = GPSPacket.SatFix; // HOTT:6
GPSPacket.HomeDirection = GPSInfo.HomeBearing / 2;//230;
return(sizeof(GPSPacket));
break;
666,7 → 673,7
ElectricAirPacket.Altitude = HoehenWert/100 + 500;
ElectricAirPacket.Battery1 = UBat;
ElectricAirPacket.Battery2 = UBat;
ElectricAirPacket.VoltageCell1 = CompassCorrected / 2;
ElectricAirPacket.VoltageCell1 = OrientationCompassCorrected / 2;
ElectricAirPacket.VoltageCell8 = ElectricAirPacket.VoltageCell1;
ElectricAirPacket.VoltageCell6 = GPSInfo.HomeBearing / 2;
ElectricAirPacket.VoltageCell7 = GPSInfo.HomeDistance/20;
689,7 → 696,7
case HOTT_GENERAL_PACKET_ID:
GetHottestBl();
HoTTGeneral.Rpm = GPSInfo.HomeDistance/100;
HoTTGeneral.VoltageCell1 = CompassCorrected / 2;
HoTTGeneral.VoltageCell1 = OrientationCompassCorrected / 2;
HoTTGeneral.VoltageCell2 = KompassValue / 2;
//HoTTGeneral.VoltageCell3 = Magnetstaerke -> macht NC
//HoTTGeneral.VoltageCell4 = Inclinition -> macht NC
749,7 → 756,7
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);
HoTT_printfxy(10,1,"DIR: %3d%c",OrientationCompassCorrected, HoTT_GRAD);
if(FC_StatusFlags2 & FC_STATUS2_CAREFREE) HoTT_printfxy_INV(20,1,"C") else HoTT_printfxy(20,1," ");
break;
case 2:
846,7 → 853,7
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);
HoTT_printfxy(0,1,"DIR:%3d%c",OrientationCompassCorrected, HoTT_GRAD);
if(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)
{
if(HoehenReglerAktiv) HoTT_printfxy_INV(10,1,"ALT:%4im", (int16_t)(HoehenWert/100))
1153,7 → 1160,7
break;
case 2:
HoTT_printfxy(11,2,"ALT:%4im", (int16_t)(HoehenWert/100))
HoTT_printfxy(11,3,"DIR: %3d%c",CompassCorrected, HoTT_GRAD);
HoTT_printfxy(11,3,"DIR: %3d%c",OrientationCompassCorrected, HoTT_GRAD);
HoTT_printfxy(11,4,"Cam: %3i",Parameter_ServoNickControl);
break;
case 3:
1233,7 → 1240,7
else
HoTT_printfxy(8,2,"ALT:%4im ",(int16_t)(HoehenWert/100))
HoTT_printfxy(8,3,"DIR: %3d%c",CompassCorrected, HoTT_GRAD);
HoTT_printfxy(8,3,"DIR: %3d%c",OrientationCompassCorrected, HoTT_GRAD);
HoTT_printfxy(8,4,"Cam: %3i",Parameter_ServoNickControl);
break;
// HoTT_printfxy(11,7,"%s",WPL_Name)
/trunk/jetimenu.c
83,13 → 83,13
if(CamCtrlCharacter != ' ')
{
if(GPSInfo.HomeDistance < 1000*10)
JetiBox_printfxy(4,0," %3d%c%c%4dm%c",CompassCorrected, 0xDF,CamCtrlCharacter, GPSInfo.HomeDistance/10,NC_GPS_ModeCharacter) // 'V' weg lassen
JetiBox_printfxy(4,0," %3d%c%c%4dm%c",OrientationCompassCorrected, 0xDF,CamCtrlCharacter, GPSInfo.HomeDistance/10,NC_GPS_ModeCharacter) // 'V' weg lassen
else
JetiBox_printfxy(4,0," %3d%c%c %4d%c",CompassCorrected, 0xDF,CamCtrlCharacter, GPSInfo.HomeDistance/10,NC_GPS_ModeCharacter); // 'V' und 'm' weg lassen
JetiBox_printfxy(4,0," %3d%c%c %4d%c",OrientationCompassCorrected, 0xDF,CamCtrlCharacter, GPSInfo.HomeDistance/10,NC_GPS_ModeCharacter); // 'V' und 'm' weg lassen
}
else
#endif
JetiBox_printfxy(6,0,"%3d%c%4dm%c",CompassCorrected, 0xDF, GPSInfo.HomeDistance/10,NC_GPS_ModeCharacter);
JetiBox_printfxy(6,0,"%3d%c%4dm%c",OrientationCompassCorrected, 0xDF, GPSInfo.HomeDistance/10,NC_GPS_ModeCharacter);
}
else
{
317,7 → 317,7
 
// if(NaviData_WaypointNumber) JetiBox_printfxy(8,1,"%2d/%d ",NaviData_WaypointIndex,NaviData_WaypointNumber)
// else JetiBox_printfxy(8,1,"--/--")
JetiBox_printfxy(0,1,"Dir:%3d Alt:%3dm",CompassCorrected,(int16_t)(HoehenWert/100))
JetiBox_printfxy(0,1,"Dir:%3d Alt:%3dm",OrientationCompassCorrected,(int16_t)(HoehenWert/100))
 
if(changed) JetiBox_printfxy(14,0,"->")
else JetiBox_printfxy(14,0," ");
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/menu.c
147,7 → 147,7
LCD_printfxy(0,0,"act. bearing");
LCD_printfxy(0,1,"Nick: %5i",IntegralNick/1024);
LCD_printfxy(0,2,"Roll: %5i",IntegralRoll/1024);
LCD_printfxy(0,3,"Compass: %5i",CompassCorrected);
LCD_printfxy(0,3,"Compass: %5i",OrientationCompassCorrected);
break;
case 3:
for(i=1;i<9;i+=2) LCD_printfxy(0,i/2,"K%i:%4i K%i:%4i ",i,PPM_in[i],i+1,PPM_in[i+1]);
248,8 → 248,8
LCD_printfxy(0,0,"Compass");
LCD_printfxy(0,1,"Magnet: %5i",KompassValue);
LCD_printfxy(0,2,"Gyro: %5i",ErsatzKompassInGrad);
LCD_printfxy(0,3,"True: %5i",CompassCorrected);
break;
LCD_printfxy(0,3,"True: %5i",OrientationCompassCorrected);
break;
case 14:
LCD_printfxy(0,0,"Servo " );
LCD_printfxy(0,1,"Setpoint %3i",Parameter_ServoNickControl);
/trunk/spi.c
586,6 → 586,7
NaviData_TargetHoldTime = FromNaviCtrl.Param.Byte[8];
NaviData_MaxWpListIndex = FromNaviCtrl.Param.Byte[9];
CompassCorrected = FromNaviCtrl.Param.sInt[5]; // Bytes 10 & 11
OrientationCompassCorrected = ((int) EE_Parameter.OrientationAngle * 15 + CompassCorrected) % 360;
CamCtrlCharacter = FromNaviCtrl.Param.Byte[12];
BaroCalState = FromNaviCtrl.Param.Byte[13];
LuftdruckTemperaturOffset = FromNaviCtrl.Param.sInt[7]; // Bytes 14 & 15