flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Set correct on ground details

Browse Source 
Fixes #307
This commit is contained in:
Lars Toenning
2024-11-22 13:35:44 +01:00
parent 65db4ee9fd
commit 733ceff368
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/fsd/fsdclient.cpp
View File

@@ -1215,8 +1215,9 @@ namespace swift::core::fsd
CSpeed(dataUpdate.m_groundSpeed, CSpeedUnit::kts())); CSpeed(dataUpdate.m_groundSpeed, CSpeedUnit::kts()));
situation.setPressureAltitude(CAltitude(dataUpdate.m_altitudePressure, CAltitude::MeanSeaLevel, situation.setPressureAltitude(CAltitude(dataUpdate.m_altitudePressure, CAltitude::MeanSeaLevel,
CAltitude::PressureAltitude, CLengthUnit::ft())); CAltitude::PressureAltitude, CLengthUnit::ft()));
// NotSetGroundDetails because here we do not know if this FSD protocol actually utilizes this flag
const COnGroundInfo og(dataUpdate.m_onGround ? COnGroundInfo::OnGround : COnGroundInfo::NotOnGround, const COnGroundInfo og(dataUpdate.m_onGround ? COnGroundInfo::OnGround : COnGroundInfo::NotOnGround,
COnGroundInfo::InFromNetwork); COnGroundInfo::NotSetGroundDetails);
situation.setOnGroundInfo(og); situation.setOnGroundInfo(og);
// Ref T297, default offset time // Ref T297, default offset time
@@ -1255,8 +1256,9 @@ namespace swift::core::fsd
CHeading(data.m_heading, CAngleUnit::deg()), CHeading(data.m_heading, CAngleUnit::deg()),
CAngle(-data.m_pitch, CAngleUnit::deg()), CAngle(-data.m_bank, CAngleUnit::deg()), CAngle(-data.m_pitch, CAngleUnit::deg()), CAngle(-data.m_bank, CAngleUnit::deg()),
CSpeed(data.m_groundSpeed, CSpeedUnit::kts())); CSpeed(data.m_groundSpeed, CSpeedUnit::kts()));
// NotSetGroundDetails because here we do not know if this FSD protocol actually utilizes this flag
const COnGroundInfo og(data.m_onGround ? COnGroundInfo::OnGround : COnGroundInfo::NotOnGround, const COnGroundInfo og(data.m_onGround ? COnGroundInfo::OnGround : COnGroundInfo::NotOnGround,
COnGroundInfo::InFromNetwork); COnGroundInfo::NotSetGroundDetails);
situation.setOnGroundInfo(og); situation.setOnGroundInfo(og);
// Ref T297, default offset time // Ref T297, default offset time
@@ -1756,9 +1758,10 @@ namespace swift::core::fsd
CAngle(interimPilotDataUpdate.m_pitch, CAngleUnit::deg()), CAngle(interimPilotDataUpdate.m_pitch, CAngleUnit::deg()),
CAngle(interimPilotDataUpdate.m_bank, CAngleUnit::deg()), CAngle(interimPilotDataUpdate.m_bank, CAngleUnit::deg()),
CSpeed(interimPilotDataUpdate.m_groundSpeed, CSpeedUnit::kts())); CSpeed(interimPilotDataUpdate.m_groundSpeed, CSpeedUnit::kts()));
// NotSetGroundDetails because here we do not know if this FSD protocol actually utilizes this flag
const COnGroundInfo og(interimPilotDataUpdate.m_onGround ? COnGroundInfo::OnGround : const COnGroundInfo og(interimPilotDataUpdate.m_onGround ? COnGroundInfo::OnGround :
COnGroundInfo::NotOnGround, COnGroundInfo::NotOnGround,
COnGroundInfo::InFromNetwork); COnGroundInfo::NotSetGroundDetails);
situation.setOnGroundInfo(og); situation.setOnGroundInfo(og);
// Ref T297, default offset time // Ref T297, default offset time

2
src/misc/aviation/ongroundinfo.h
View File

@@ -29,7 +29,7 @@ namespace swift::misc::aviation
//! Reliability of on ground information //! Reliability of on ground information
enum OnGroundDetails enum OnGroundDetails
{ {
NotSetGroundDetails, NotSetGroundDetails, //!< not set or unknown if correct (e.g. FSD might or might not use the flag)
// interpolated situation // interpolated situation
OnGroundByInterpolation, //!< strongest for remote aircraft OnGroundByInterpolation, //!< strongest for remote aircraft
OnGroundByElevationAndCG, OnGroundByElevationAndCG,