Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 738 → Rev 739

/trunk/gpx.c
510,7 → 510,7
FC.FromFC_SpeakHoTT = 0; // can be cleared now
CheckSumAndWrite(&Check16Block,string, doc->file);
// Altimeter according to air pressure
sprintf(string, "<Altimeter>%d,'%c'</Altimeter>\r\n", NaviData.Altimeter,FromFC_VarioCharacter);
sprintf(string, "<Altimeter>%d,'%c'</Altimeter>\r\n", NaviData.Altimeter_5cm,FromFC_VarioCharacter);
CheckSumAndWrite(&Check16Block,string, doc->file);
// Variometer according to air pressure
sprintf(string, "<Variometer>%d</Variometer>\r\n", NaviData.Variometer);
/trunk/main.c
397,7 → 397,7
DebugOut.StatusRed |= AMPEL_NC;
SD_LoggingError = 0;
}
else if(((AbsoluteFlyingAltitude) && (NaviData.Altimeter_20cm / 20 >= AbsoluteFlyingAltitude)) && (FC.StatusFlags & FC_STATUS_FLY))
else if(((AbsoluteFlyingAltitude) && (NaviData.Altimeter_5cm / 20 >= AbsoluteFlyingAltitude)) && (FC.StatusFlags & FC_STATUS_FLY))
{
LED_RED_ON;
sprintf(ErrorMSG,"ERR:Max Altitude ");
/trunk/main.h
275,7 → 275,7
s16 FromFC_CompassOffset;
u8 FromFC_DisableDeclination;
u8 StatusFlags3;
s16 Altimeter;
s16 Altimeter_5cm; // devide by 20 to get meters & multiply with 5 to get cm
u8 RealStatusFlags; // this is a copy of the status flags -> but not effected by the simulation
u16 AdNeutralNick;
u16 AdNeutralRoll;
/trunk/spi_slave.c
351,7 → 351,7
 
SPI0_Timeout = SetDelay(4*SPI0_TIMEOUT);
EE_Parameter.Revision = 0;
sprintf(EE_Parameter.Name,"???\0");
sprintf(EE_Parameter.Name,"???%c",0);
UART1_PutString("ok");
}
 
882,8 → 882,8
// else CompassCalState = 0;
}
HoverGas = FromFlightCtrl.Param.Byte[1];
NaviData.Variometer = (NaviData.Variometer + 2 * (FromFlightCtrl.Param.sInt[1] - NaviData.Altimeter_20cm)) / 2; // provisorisch
FC.Altimeter = FromFlightCtrl.Param.sInt[1]; // in 5cm
NaviData.Variometer = (NaviData.Variometer + 2 * (FromFlightCtrl.Param.sInt[1] - NaviData.Altimeter_5cm)) / 2; // provisorisch
FC.Altimeter_5cm = FromFlightCtrl.Param.sInt[1]; // in 5cm
if(!(SimulationFlags & SIMULATION_ACTIVE)) NaviData.SetpointAltitude = FromFlightCtrl.Param.sInt[2]; // in 5cm
FC.Error[0] |= FromFlightCtrl.Param.Byte[6];
FC.Error[1] |= FromFlightCtrl.Param.Byte[7];
/trunk/triggerlog.c
83,7 → 83,7
TrigLogging.Count++;
if(BlitzSchuhConnected) TrigLogging.CountExternal++;
else TrigLogging.CountExternal = 0;
TrigLogging.AltiBaro = NaviData.Altimeter_20cm * 5; // in cm
TrigLogging.AltiBaro = NaviData.Altimeter_5cm * 5; // in cm
TrigLogging.AltiGPS = GPSData.Position.Altitude;
TrigLogging.ShutterCounter = NaviData_Volatile.ShutterCounter;
 
/trunk/uart1.c
850,7 → 850,7
i += sprintf(&array[i],"%d,",GPSData.NumOfSats);
i += sprintf(&array[i],"%d.%d,",(s16)(GPSData.Position_Accuracy/100),abs(GPSData.Position_Accuracy%100));
// i += sprintf(&array[i],"%d.%d,M,",GPSData.Position.Altitude/1000,abs(GPSData.Position.Altitude%1000)/100);
tmp1 = NaviData.Altimeter_20cm / 2; // in dm
tmp1 = NaviData.Altimeter_5cm / 2; // in dm
i += sprintf(&array[i],"%d.%d,M,",(s16)tmp1 / 10,abs((s16)tmp1 % 10));
i += sprintf(&array[i],",,,*");
}
1059,7 → 1059,7
NaviData_Flags.Index = 11;
NaviData_Flags.ActualLongitude = NaviData.CurrentPosition.Longitude;
NaviData_Flags.ActualLatitude = NaviData.CurrentPosition.Latitude;
NaviData_Flags.Altimeter_20cm = NaviData.Altimeter_20cm;
NaviData_Flags.Altimeter_5cm = NaviData.Altimeter_5cm;
NaviData_Flags.GroundSpeed = NaviData.GroundSpeed / 10;
NaviData_Flags.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2);
NaviData_Flags.OSDStatusFlags2 = (FC.StatusFlags & ~OSD_FLAG_MASK1) | (FC.StatusFlags2 & ~OSD_FLAG_MASK2);
1085,7 → 1085,7
NaviData_Target.Index = 12;
NaviData_Target.ActualLongitude = NaviData.CurrentPosition.Longitude;
NaviData_Target.ActualLatitude = NaviData.CurrentPosition.Latitude;
NaviData_Target.Altimeter_20cm = NaviData.Altimeter_20cm;
NaviData_Target.Altimeter_5cm = NaviData.Altimeter_5cm;
NaviData_Target.GroundSpeed = NaviData.GroundSpeed / 10;
NaviData_Target.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2);
NaviData_Target.TargetLongitude = NaviData.TargetPosition.Longitude;
1106,7 → 1106,7
NaviData_WP.Index = 15;
NaviData_WP.ActualLongitude = NaviData.CurrentPosition.Longitude;
NaviData_WP.ActualLatitude = NaviData.CurrentPosition.Latitude;
NaviData_WP.Altimeter_20cm = NaviData.Altimeter_20cm;
NaviData_WP.Altimeter_5cm = NaviData.Altimeter_5cm;
NaviData_WP.GroundSpeed = NaviData.GroundSpeed / 10;
NaviData_WP.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2);
NaviData_WP.WaypointIndex = NaviData.WaypointIndex;
1127,7 → 1127,7
NaviData_Failsafe.Index = 17;
NaviData_Failsafe.ActualLongitude = NaviData.CurrentPosition.Longitude;
NaviData_Failsafe.ActualLatitude = NaviData.CurrentPosition.Latitude;
NaviData_Failsafe.Altimeter_20cm = NaviData.Altimeter_20cm;
NaviData_Failsafe.Altimeter_5cm = NaviData.Altimeter_5cm;
NaviData_Failsafe.GroundSpeed = NaviData.GroundSpeed / 10;
NaviData_Failsafe.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2);
NaviData_Failsafe.Longitude = GPS_FailsafePosition.Longitude;
1146,7 → 1146,7
NaviData_Home.Index = 13;
NaviData_Home.ActualLongitude = NaviData.CurrentPosition.Longitude;
NaviData_Home.ActualLatitude = NaviData.CurrentPosition.Latitude;
NaviData_Home.Altimeter_20cm = NaviData.Altimeter_20cm;
NaviData_Home.Altimeter_5cm = NaviData.Altimeter_5cm;
NaviData_Home.GroundSpeed = NaviData.GroundSpeed / 10;
NaviData_Home.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2);
NaviData_Home.HomeLongitude = NaviData.HomePosition.Longitude;
1166,7 → 1166,7
NaviData_Deviation.Index = 14;
NaviData_Deviation.ActualLongitude = NaviData.CurrentPosition.Longitude;
NaviData_Deviation.ActualLatitude = NaviData.CurrentPosition.Latitude;
NaviData_Deviation.Altimeter_20cm = NaviData.Altimeter_20cm;
NaviData_Deviation.Altimeter_5cm = NaviData.Altimeter_5cm;
NaviData_Deviation.GroundSpeed = NaviData.GroundSpeed / 10;
NaviData_Deviation.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2);
NaviData_Deviation.FlyingTime = NaviData.FlyingTime;
1184,7 → 1184,7
NaviData_Volatile.Index = 16;
NaviData_Volatile.ActualLongitude = NaviData.CurrentPosition.Longitude;
NaviData_Volatile.ActualLatitude = NaviData.CurrentPosition.Latitude;
NaviData_Volatile.Altimeter_20cm = NaviData.Altimeter_20cm;
NaviData_Volatile.Altimeter_5cm = NaviData.Altimeter_5cm;
NaviData_Volatile.GroundSpeed = NaviData.GroundSpeed / 10;
NaviData_Volatile.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2);
NaviData_Volatile.UBat = FC.BAT_Voltage;
1202,7 → 1202,7
NaviData_Tiny.Index = 10;
NaviData_Tiny.ActualLongitude = NaviData.CurrentPosition.Longitude;
NaviData_Tiny.ActualLatitude = NaviData.CurrentPosition.Latitude;
NaviData_Tiny.Altimeter_20cm = NaviData.Altimeter_20cm;
NaviData_Tiny.Altimeter_5cm = NaviData.Altimeter_5cm;
NaviData_Tiny.GroundSpeed = NaviData.GroundSpeed / 10;
NaviData_Tiny.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2);
NaviData_Tiny.CamCtrlChar = CamCtrlCharacter;
1363,7 → 1363,7
Data3D.AngleNick = FromFlightCtrl.AngleNick; // in 0.1 deg
Data3D.AngleRoll = FromFlightCtrl.AngleRoll; // in 0.1 deg
Data3D.Heading = FromFlightCtrl.GyroHeading; // in 0.1 deg
Data3D.Altimeter = FC.Altimeter; // in 5cm -> 20 = 1m
Data3D.Altimeter_5cm = FC.Altimeter_5cm; // in 5cm -> 20 = 1m
MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'C', NC_ADDRESS, 1,(u8 *)&Data3D, sizeof(Data3D));
UART1_Data3D_Timer = SetDelay(UART1_Data3D_Interval);
UART1_Request_Data3D = FALSE;
/trunk/uart1.h
46,7 → 46,7
u8 StickRoll;
u8 StickYaw;
u8 StickGas;
s16 Altimeter; // in 5cm
s16 Altimeter_5cm; // in 5cm -> devide by 20 to get meters & multiply with 5 to get cm
u8 reserve[2];
} __attribute__((packed)) Data3D_t;
 
153,7 → 153,7
u8 WaypointIndex; // index of current waypoints running from 0 to WaypointNumber-1
u8 WaypointNumber; // number of stored waypoints
u8 SatsInUse; // number of satellites used for position solution
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure
s16 Variometer; // climb(+) and sink(-) rate
u16 FlyingTime; // in seconds
u8 UBat; // Battery Voltage in 0.1 Volts
182,7 → 182,7
u8 Index; // version of the data structure
s32 ActualLongitude; //
s32 ActualLatitude; //
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure -> devide by 20 to get meters & multiply with 5 to get cm
u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h)
u8 OSDStatusFlags;
u8 CamCtrlChar; // Status from a connected CamCtrl unit: 'R' = REC 'c' = Ready '!' = Error ...etc
197,7 → 197,7
u8 Index; // version of the data structure
s32 ActualLongitude; //
s32 ActualLatitude; //
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure -> devide by 20 to get meters & multiply with 5 to get cm -> devide by 20 to get meters & multiply with 5 to get cm
u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h)
u8 OSDStatusFlags;
u8 OSDStatusFlags2;
216,7 → 216,7
u8 Index; // version of the data structure
s32 ActualLongitude; //
s32 ActualLatitude; //
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure -> devide by 20 to get meters & multiply with 5 to get cm
u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h)
u8 OSDStatusFlags;
s32 TargetLongitude; //
232,7 → 232,7
u8 Index; // version of the data structure
s32 ActualLongitude; //
s32 ActualLatitude; //
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure -> devide by 20 to get meters & multiply with 5 to get cm
u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h)
u8 OSDStatusFlags;
s32 HomeLongitude; //
252,7 → 252,7
u8 Index; // version of the data structure
s32 ActualLongitude; //
s32 ActualLatitude; //
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure -> devide by 20 to get meters & multiply with 5 to get cm
u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h)
u8 OSDStatusFlags;
s32 Longitude; //
274,7 → 274,7
u8 Index; // version of the data structure
s32 ActualLongitude; //
s32 ActualLatitude; //
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure -> devide by 20 to get meters & multiply with 5 to get cm
u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h)
u8 OSDStatusFlags;
u8 WaypointIndex; // index of current waypoints running from 0 to WaypointNumber-1
290,7 → 290,7
u8 Index; // version of the data structure
s32 ActualLongitude; //
s32 ActualLatitude; //
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure -> devide by 20 to get meters & multiply with 5 to get cm
u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h)
u8 OSDStatusFlags;
u16 FlyingTime; // in seconds
309,7 → 309,7
u8 Index; // version of the data structure
s32 ActualLongitude; //
s32 ActualLatitude; //
s16 Altimeter_20cm; // hight according to air pressure
s16 Altimeter_5cm; // hight according to air pressure -> devide by 20 to get meters & multiply with 5 to get cm
u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h)
u8 OSDStatusFlags;
u16 UBat; // Battery Voltage in 0.1 Volts