| /trunk/main.c |
|---|
| 397,7 → 397,7 |
| DebugOut.StatusRed |= AMPEL_NC; |
| SD_LoggingError = 0; |
| } |
| else if(((AbsoluteFlyingAltitude) && (NaviData.Altimeter / 20 >= AbsoluteFlyingAltitude)) && (FC.StatusFlags & FC_STATUS_FLY)) |
| else if(((AbsoluteFlyingAltitude) && (NaviData.Altimeter_20cm / 20 >= AbsoluteFlyingAltitude)) && (FC.StatusFlags & FC_STATUS_FLY)) |
| { |
| LED_RED_ON; |
| sprintf(ErrorMSG,"ERR:Max Altitude "); |
| /trunk/main.h |
|---|
| 14,7 → 14,7 |
| #define VERSION_MAJOR 2 |
| #define VERSION_MINOR 13 |
| #define VERSION_PATCH 7 |
| #define VERSION_PATCH 9 |
| // 0 = A |
| // 1 = B |
| // 2 = C |
| /trunk/spi_slave.c |
|---|
| 121,7 → 121,7 |
| s32 CompassDirectionAtMotorStart = 0; // in 0,1° |
| s16 FC_WP_EventChannel = 0, LogFC_WP_EventChannel = 0, FC_WP_EventChannel_Processed = 0; // gibt einen Schaltkanal an die FC weiter, wenn der Wegpunkt erreicht wurde |
| u32 ToFC_AltitudeRate = 0; |
| s32 ToFC_AltitudeSetpoint = 0; |
| s32 ToFC_AltitudeSetpoint_dm = 0; |
| u8 FromFC_VarioCharacter = ' '; |
| s16 GPS_Aid_StickMultiplikator = 0; |
| u8 NC_GPS_ModeCharacter = ' '; |
| 557,7 → 557,7 |
| } |
| else |
| { |
| ToFlightCtrl.Param.sInt[5] = (s16)ToFC_AltitudeSetpoint; |
| ToFlightCtrl.Param.sInt[5] = (s16)ToFC_AltitudeSetpoint_dm; |
| } |
| //DebugOut.Analog[] = ToFlightCtrl.Param.Byte[8]; |
| break; |
| 882,7 → 882,7 |
| // else CompassCalState = 0; |
| } |
| HoverGas = FromFlightCtrl.Param.Byte[1]; |
| NaviData.Variometer = (NaviData.Variometer + 2 * (FromFlightCtrl.Param.sInt[1] - NaviData.Altimeter)) / 2; // provisorisch |
| NaviData.Variometer = (NaviData.Variometer + 2 * (FromFlightCtrl.Param.sInt[1] - NaviData.Altimeter_20cm)) / 2; // provisorisch |
| FC.Altimeter = 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]; |
| /trunk/spi_slave.h |
|---|
| 78,7 → 78,7 |
| extern s32 HeadFreeStartAngle,CompassDirectionAtMotorStart; |
| extern s16 FC_WP_EventChannel,LogFC_WP_EventChannel,FC_WP_EventChannel_Processed; |
| extern u32 ToFC_AltitudeRate; |
| extern s32 ToFC_AltitudeSetpoint; |
| extern s32 ToFC_AltitudeSetpoint_dm; |
| extern u8 NC_GPS_ModeCharacter; |
| extern u8 FC_is_Calibrated; |
| extern u8 FCCalibActive; |
| /trunk/triggerlog.c |
|---|
| 83,7 → 83,7 |
| TrigLogging.Count++; |
| if(BlitzSchuhConnected) TrigLogging.CountExternal++; |
| else TrigLogging.CountExternal = 0; |
| TrigLogging.AltiBaro = NaviData.Altimeter * 5; // in cm |
| TrigLogging.AltiBaro = NaviData.Altimeter_20cm * 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 / 2; // in dm |
| tmp1 = NaviData.Altimeter_20cm / 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 = NaviData.Altimeter; |
| NaviData_Flags.Altimeter_20cm = NaviData.Altimeter_20cm; |
| 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 = NaviData.Altimeter; |
| NaviData_Target.Altimeter_20cm = NaviData.Altimeter_20cm; |
| 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 = NaviData.Altimeter; |
| NaviData_WP.Altimeter_20cm = NaviData.Altimeter_20cm; |
| 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 = NaviData.Altimeter; |
| NaviData_Failsafe.Altimeter_20cm = NaviData.Altimeter_20cm; |
| 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 = NaviData.Altimeter; |
| NaviData_Home.Altimeter_20cm = NaviData.Altimeter_20cm; |
| 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 = NaviData.Altimeter; |
| NaviData_Deviation.Altimeter_20cm = NaviData.Altimeter_20cm; |
| 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 = NaviData.Altimeter; |
| NaviData_Volatile.Altimeter_20cm = NaviData.Altimeter_20cm; |
| 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 = NaviData.Altimeter; |
| NaviData_Tiny.Altimeter_20cm = NaviData.Altimeter_20cm; |
| NaviData_Tiny.GroundSpeed = NaviData.GroundSpeed / 10; |
| NaviData_Tiny.OSDStatusFlags = (FC.StatusFlags & OSD_FLAG_MASK1) | (FC.StatusFlags2 & OSD_FLAG_MASK2); |
| NaviData_Tiny.CamCtrlChar = CamCtrlCharacter; |
| /trunk/uart1.h |
|---|
| 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; // hight according to air pressure |
| s16 Altimeter_20cm; // 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; // hight according to air pressure |
| s16 Altimeter_20cm; // hight according to air pressure |
| 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; // hight according to air pressure |
| s16 Altimeter_20cm; // hight according to air pressure |
| 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; // hight according to air pressure |
| s16 Altimeter_20cm; // hight according to air pressure |
| 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; // hight according to air pressure |
| s16 Altimeter_20cm; // hight according to air pressure |
| 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; // hight according to air pressure |
| s16 Altimeter_20cm; // hight according to air pressure |
| 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; // hight according to air pressure |
| s16 Altimeter_20cm; // hight according to air pressure |
| 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; // hight according to air pressure |
| s16 Altimeter_20cm; // hight according to air pressure |
| 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; // hight according to air pressure |
| s16 Altimeter_20cm; // hight according to air pressure |
| u8 GroundSpeed; // speed over ground in 10cm/s (2D) (255 = 91km/h) |
| u8 OSDStatusFlags; |
| u16 UBat; // Battery Voltage in 0.1 Volts |