Skip to content

Commit

Permalink
Revert "Issue #93 Reduce update offset for 5 Hz updates and rename me…
Browse files Browse the repository at this point in the history
…mber"

This reverts commit 8dc206d.
  • Loading branch information
ltoenning committed Feb 13, 2024
1 parent 2d2ffeb commit f8bef4a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/blackcore/fsd/fsdclient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1928,9 +1928,9 @@ namespace BlackCore::Fsd
const qint64 avgTimeMs = this->averageOffsetTimeMs(callsign, count, 3); // latest average
qint64 offsetTime = CFsdSetup::c_positionTimeOffsetMsec;

if (avgTimeMs < CFsdSetup::c_minimumPositionTimeOffsetMsec && count >= 3)
if (avgTimeMs < CFsdSetup::c_interimPositionTimeOffsetMsec && count >= 3)
{
offsetTime = CFsdSetup::c_minimumPositionTimeOffsetMsec;
offsetTime = CFsdSetup::c_interimPositionTimeOffsetMsec;
}

return m_additionalOffsetTime + offsetTime;
Expand Down
2 changes: 1 addition & 1 deletion src/blackmisc/network/fsdsetup.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace BlackMisc::Network
//! Offset times basically telling when to expect the next value from network plus some reserve
//! \remark related to CNetworkVatlib::c_updatePostionIntervalMsec / c_updateInterimPostionIntervalMsec
static constexpr qint64 c_positionTimeOffsetMsec = 6000; //!< offset time for received position updates Ref T297
static constexpr qint64 c_minimumPositionTimeOffsetMsec = 700; //!< offset time for vatsim high frequency position updates
static constexpr qint64 c_interimPositionTimeOffsetMsec = 1500; //!< offset time for received interim position updates Ref T297
//! @}

//! Default constructor.
Expand Down
2 changes: 1 addition & 1 deletion src/blackmisc/simulation/interpolatorspline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ namespace BlackMisc::Simulation
}

// set some default values
const qint64 os = qMax(CFsdSetup::c_minimumPositionTimeOffsetMsec, m_s[2].getTimeOffsetMs());
const qint64 os = qMax(CFsdSetup::c_interimPositionTimeOffsetMsec, m_s[2].getTimeOffsetMs());
m_s[0].addMsecs(-os); // oldest, Ref T297 default offset time to fill data
m_s[2].addMsecs(os); // latest, Ref T297 default offset time to fill data
if (m_currentSituations.isEmpty()) { return false; }
Expand Down

0 comments on commit f8bef4a

Please sign in to comment.